From f37e4352d29236c19101c0dc8f78a045d02960b6 Mon Sep 17 00:00:00 2001 From: Daniel Jennings <582974+danieljennings@users.noreply.github.com> Date: Thu, 19 Dec 2019 10:05:24 -0800 Subject: [PATCH 01/12] Update README.md Remove build status --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index bb09544..dc7297c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://ci.appveyor.com/api/projects/status/github/gorlak/P4Win?branch=master&svg=true)](https://ci.appveyor.com/project/GeoffEvans/p4win) - ### About This Project From Perforce Software: From 686d3190ed449dd24fb94d03b8069fde1acb0a28 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 10:07:58 -0800 Subject: [PATCH 02/12] Update Premake dependency to v5.0.0-alpha14 for VS2019 support. --- Dependencies/premake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dependencies/premake b/Dependencies/premake index 14a21c3..f1dbf78 160000 --- a/Dependencies/premake +++ b/Dependencies/premake @@ -1 +1 @@ -Subproject commit 14a21c353a12bdd3fcb894d2fa932478b2f47e42 +Subproject commit f1dbf78e250c654f94f7af3e6522a0fb65e9f456 From 61333f426a666ccbbe81e363e9eea0f74dba9c8d Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 10:28:04 -0800 Subject: [PATCH 03/12] Update the Depots command response handler to include support for "archive" depots. I'm just treating those as remote depots, as you can't even list the files in such a depot without a different command, e.g. 'p4 files -A //archive/...'. But it shows up in the depot list, at least. --- Source/gui/p4api/Cmd_Depots.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/gui/p4api/Cmd_Depots.cpp b/Source/gui/p4api/Cmd_Depots.cpp index 4c43bae..f7f838e 100644 --- a/Source/gui/p4api/Cmd_Depots.cpp +++ b/Source/gui/p4api/Cmd_Depots.cpp @@ -106,6 +106,8 @@ void CCmd_Depots::OnOutputInfo( char level, LPCTSTR data, LPCTSTR msg ) m_LocalDepotList.AddHead( depotName ); else if( depotType.CompareNoCase(_T("remote")) == 0) m_RemoteDepotList.AddHead( depotName ); + else if( depotType.CompareNoCase(_T("archive")) == 0) + m_RemoteDepotList.AddHead( depotName ); else if( depotType.CompareNoCase(_T("spec")) == 0) { if (GET_SERVERLEVEL() >= 18) From a0ecd62b28d8005f04bc9e19e035af4de666f672 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 10:30:54 -0800 Subject: [PATCH 04/12] We know, but don't need, the "Broker address" from p4 info. --- Source/gui/p4api/Cmd_Info.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/gui/p4api/Cmd_Info.cpp b/Source/gui/p4api/Cmd_Info.cpp index c0f5cd6..1c0f6c1 100644 --- a/Source/gui/p4api/Cmd_Info.cpp +++ b/Source/gui/p4api/Cmd_Info.cpp @@ -96,6 +96,8 @@ void CCmd_Info::OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg) ; // we know about it, but don't care about it else if(tag == _T("Changelist server")) ; // we know about it, but don't care about it + else if(tag == _T("Broker address")) + ; // we know about it, but don't care about it else { ASSERT(0); // info not recognized From 4e1d8dfd679c3d507049768a2acb7f720fec9f57 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 10:32:13 -0800 Subject: [PATCH 05/12] Also the other three broker fields. --- Source/gui/p4api/Cmd_Info.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/gui/p4api/Cmd_Info.cpp b/Source/gui/p4api/Cmd_Info.cpp index 1c0f6c1..1e78fdc 100644 --- a/Source/gui/p4api/Cmd_Info.cpp +++ b/Source/gui/p4api/Cmd_Info.cpp @@ -98,6 +98,12 @@ void CCmd_Info::OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg) ; // we know about it, but don't care about it else if(tag == _T("Broker address")) ; // we know about it, but don't care about it + else if(tag == _T("Broker encryption")) + ; // we know about it, but don't care about it + else if(tag == _T("Broker cert expires")) + ; // we know about it, but don't care about it + else if(tag == _T("Broker version")) + ; // we know about it, but don't care about it else { ASSERT(0); // info not recognized From 5d7939d886ee159cb978cb485180a1ee4c3e5810 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 11:43:57 -0800 Subject: [PATCH 06/12] Do the same UAC stuff as gorlak had in his UAC branch. --- Source/common/ExceptionHandler.cpp | 1 - Source/gui/MainFrm.cpp | 7 ------- Source/gui/P4Registry.cpp | 27 --------------------------- Source/gui/P4Registry.h | 1 - Source/gui/res/P4Win.manifest | 7 ------- premake5.lua | 5 ----- 6 files changed, 48 deletions(-) diff --git a/Source/common/ExceptionHandler.cpp b/Source/common/ExceptionHandler.cpp index 55348dc..f95d974 100644 --- a/Source/common/ExceptionHandler.cpp +++ b/Source/common/ExceptionHandler.cpp @@ -817,7 +817,6 @@ static void WriteMiniDump(LPCTSTR pszPath, PEXCEPTION_POINTERS pExceptPtrs) void WriteRegistryDetails(LPCTSTR pszPath) { - WriteRegistryTreeToFile(_T("HKLM\\Software\\Perforce"), pszPath); WriteRegistryTreeToFile(_T("HKCU\\Software\\Perforce"), pszPath); } diff --git a/Source/gui/MainFrm.cpp b/Source/gui/MainFrm.cpp index a37f90a..c29cf22 100644 --- a/Source/gui/MainFrm.cpp +++ b/Source/gui/MainFrm.cpp @@ -615,13 +615,6 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) MainFrameCWnd = this; - // Vista sucks and won't let us write to HKEY_LOCAL_MACHINE - // unless we have elevated privilages. But those writes - // happen in the p4api and don't return status. So write - // a dummy key for testing and report any failure. - - GET_P4REGPTR()->TestRegWrite2HKLM(); - // This timer is here to support auto-update and miscellaneous // tasks. Will result in OnTimer() being called every .2 secs. // The interval is a compromise between diff --git a/Source/gui/P4Registry.cpp b/Source/gui/P4Registry.cpp index cc64325..e13e370 100644 --- a/Source/gui/P4Registry.cpp +++ b/Source/gui/P4Registry.cpp @@ -4931,33 +4931,6 @@ void CP4Registry::WriteVirginRegistry() RegCloseKey(key); } -BOOL CP4Registry::TestRegWrite2HKLM() -{ - HKEY hKey = NULL; - CString sKey = _T("Software\\Perforce\\environment\\"); - DWORD disposition; - TCHAR test[] = _T("test"); - LONG rc; - if ( (rc = RegCreateKeyEx( HKEY_LOCAL_MACHINE, sKey, - 0, NULL, - REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, - &hKey, &disposition )) == ERROR_SUCCESS ) - { - disposition = sizeof(test); - rc = RegSetValueEx(hKey, _T("P4Win"), NULL, REG_SZ, - (LPBYTE)test, disposition); - } - - if (rc != ERROR_SUCCESS ) - { - RegWriteFailed(rc); - return FALSE; - } - return TRUE; -} - - void CP4Registry::RegWriteFailed(LONG rc) { LPVOID lpMsgBuf; diff --git a/Source/gui/P4Registry.h b/Source/gui/P4Registry.h index 9b4d25a..c8d797f 100644 --- a/Source/gui/P4Registry.h +++ b/Source/gui/P4Registry.h @@ -885,7 +885,6 @@ class CP4Registry void ReadDiffAssocList(); void ReadMergeAssocList(); CString GetPasswordfromReg( ); - BOOL TestRegWrite2HKLM(); protected: POSITION FindAssociation(LPCTSTR extension); diff --git a/Source/gui/res/P4Win.manifest b/Source/gui/res/P4Win.manifest index 4364843..606bd2b 100644 --- a/Source/gui/res/P4Win.manifest +++ b/Source/gui/res/P4Win.manifest @@ -2,13 +2,6 @@ Perforce Windows Client - - - - - - - diff --git a/premake5.lua b/premake5.lua index 57a72b0..4f0d826 100644 --- a/premake5.lua +++ b/premake5.lua @@ -536,11 +536,6 @@ project "P4Win" pchheader( "StdAfx.h" ) pchsource( "Source/gui/StdAfx.cpp" ) - linkoptions - { - "/manifestuac:no" - } - links { "librpc", From a2dabb6eb663894d924459880d35dd67375b435c Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 11:52:14 -0800 Subject: [PATCH 07/12] Make this an enum for my own sanity; I'm going to try to not touch any code like this that I don't have to, but my will is weak. --- Source/gui/p4api/Cmd_Changes.cpp | 2 +- Source/gui/p4api/Cmd_Changes.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/gui/p4api/Cmd_Changes.cpp b/Source/gui/p4api/Cmd_Changes.cpp index 29e6f80..514f300 100644 --- a/Source/gui/p4api/Cmd_Changes.cpp +++ b/Source/gui/p4api/Cmd_Changes.cpp @@ -38,7 +38,7 @@ CCmd_Changes::~CCmd_Changes() // 0 -> no, do not add -l or -L // 1 -> yes, use -l to get full descriptions // 2 -> yes, use -L to get max 250 byte descriptions (valid only on 2005.1 and later servers) -BOOL CCmd_Changes::Run(int filter, int loquatious, CStringList *viewSpec/*=NULL*/, +BOOL CCmd_Changes::Run(ECmdChangesFilter filter, int loquatious, CStringList *viewSpec/*=NULL*/, long numToFetch/*=0*/, BOOL inclInteg/*=FALSE*/, CString *user/*=NULL*/, CString *client/*=NULL*/) { diff --git a/Source/gui/p4api/Cmd_Changes.h b/Source/gui/p4api/Cmd_Changes.h index 6103bff..cd44a7e 100644 --- a/Source/gui/p4api/Cmd_Changes.h +++ b/Source/gui/p4api/Cmd_Changes.h @@ -7,9 +7,13 @@ // #include "P4Command.h" -#define ALL_CHANGES 1 -#define PENDING_CHANGES 2 -#define SUBMITTED_CHANGES 3 + +enum ECmdChangesFilter +{ + ALL_CHANGES = 1, + PENDING_CHANGES = 2, + SUBMITTED_CHANGES = 3, +}; class CCmd_Changes : public CP4Command @@ -20,7 +24,7 @@ class CCmd_Changes : public CP4Command ~CCmd_Changes(); DECLARE_DYNCREATE(CCmd_Changes) - BOOL Run(int filter, int loquatious, CStringList *viewSpec=NULL, long numToFetch=0, BOOL inclInteg=FALSE, CString *user=NULL, CString *client=NULL); + BOOL Run(ECmdChangesFilter filter, int loquatious, CStringList *viewSpec=NULL, long numToFetch=0, BOOL inclInteg=FALSE, CString *user=NULL, CString *client=NULL); CObArray *GetChanges() { return &m_Changes; } // Attributes From 64639db98fbb149831a45d670c7b20484d3185b9 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 14:24:00 -0800 Subject: [PATCH 08/12] Fix some busted menu items that need to use LoadStringResource. It looked like I could just pass the actual Menu ID to LoadStringResource and it would work, but all of the other spots found the correct string directly, so I've done that. --- Source/gui/DeltaTreeCtrl.cpp | 2 +- Source/gui/DepotTreeCtrl.cpp | 4 ++-- Source/gui/P4Change.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/gui/DeltaTreeCtrl.cpp b/Source/gui/DeltaTreeCtrl.cpp index 4f53433..f3fd89b 100644 --- a/Source/gui/DeltaTreeCtrl.cpp +++ b/Source/gui/DeltaTreeCtrl.cpp @@ -5589,7 +5589,7 @@ void CDeltaTreeCtrl::OnContextMenu(CWnd* pWnd, CPoint point) // if(HasChildren(currentItem)) { - popMenu.AppendMenu( stringsON, ID_CHANGE_SUBMIT ); + popMenu.AppendMenu( stringsON, ID_CHANGE_SUBMIT, LoadStringResource( IDS_SUBMIT ) ); popMenu.AppendMenu(MF_SEPARATOR); } diff --git a/Source/gui/DepotTreeCtrl.cpp b/Source/gui/DepotTreeCtrl.cpp index c183fa6..12a01a9 100644 --- a/Source/gui/DepotTreeCtrl.cpp +++ b/Source/gui/DepotTreeCtrl.cpp @@ -5730,8 +5730,8 @@ void CDepotTreeCtrl::OnContextMenu(CWnd* pWnd, CPoint point) if( anyChildren || ( anyInview && !allNotInDepot )) { - getMenu.AppendMenu( stringsON, ID_FILE_GETCUSTOM ); - getMenu.AppendMenu( stringsON, ID_FILE_REFRESH ); + getMenu.AppendMenu( stringsON, ID_FILE_GETCUSTOM, LoadStringResource( SERVER_IS_982_ORMORE ? IDS_SYNCTORLCD : IDS_SYNCTORLC ) ); + getMenu.AppendMenu( stringsON, ID_FILE_REFRESH, LoadStringResource( IDS_REDOSYNCTOSAME ) ); getMenu.AppendMenu( stringsON, ID_FILE_FORCESYNCTOHEAD, LoadStringResource( IDS_FILE_FORCESYNCTOHEAD ) ); } diff --git a/Source/gui/P4Change.h b/Source/gui/P4Change.h index 2264b0e..cbacb5b 100644 --- a/Source/gui/P4Change.h +++ b/Source/gui/P4Change.h @@ -23,6 +23,7 @@ class CP4Change : public CObject CString m_User; BOOL m_Initialized; BOOL m_Pending; + BOOL m_Shelved; BOOL m_MyChange; CString m_Description; From f7cd13c77ffd0f8084497284ae327ff284806620 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Thu, 19 Dec 2019 15:33:50 -0800 Subject: [PATCH 09/12] Add a new simple icon for a Shelved indicator, and added the composite variants for the different combos. --- Source/gui/ImageList.cpp | 19 ++++++++++++++++++- Source/gui/ImageList.h | 4 ++++ Source/gui/res/ViewIcons32.bmp | Bin 61494 -> 63032 bytes 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Source/gui/ImageList.cpp b/Source/gui/ImageList.cpp index 56b35b1..1c16cb5 100644 --- a/Source/gui/ImageList.cpp +++ b/Source/gui/ImageList.cpp @@ -53,6 +53,7 @@ enum SrcImages // more simple images SI_OPENFOLDER, + SI_SHELVED, }; // convert from CUSB enum flag to image index @@ -243,6 +244,20 @@ void CP4ViewImageList::MakeBitmap(CP4Image &dst, CP4Image &src, COLORREF bg) dst.BlendImage(i, src, CP4ViewImageList::VI_YOUROTHERCHANGE); dst.BlendImage(i++, src, SI_NOT_SYNCED); + // create the pending with shelved files chglist ones + dst.BlendImage(i, src, CP4ViewImageList::VI_YOURCHANGE); + dst.BlendImage(i++, src, SI_SHELVED); + dst.BlendImage(i, src, CP4ViewImageList::VI_THEIRCHANGE); + dst.BlendImage(i++, src, SI_SHELVED); + + // same, but for shelved + not synced case + dst.BlendImage(i, src, CP4ViewImageList::VI_YOURCHANGE); + dst.BlendImage(i, src, SI_SHELVED); + dst.BlendImage(i++, src, SI_NOT_SYNCED); + dst.BlendImage(i, src, CP4ViewImageList::VI_THEIRCHANGE); + dst.BlendImage(i, src, SI_SHELVED); + dst.BlendImage(i++, src, SI_NOT_SYNCED); + int x = i * 24; // copy client, plus badges @@ -278,7 +293,9 @@ bool CP4ViewImageList::Create() 3 + // sync states: none, synced, not synced 1 + // wierd ghost combo 1 + // open folder - 2 ); // 2 unresolved pending chglists + 2 + // 2 unresolved pending chglists + 2 + // 2 unresolved + shelved pending changelists + 2 ); // your/their change with shelved files CDC dc; dc.CreateDC(_T("DISPLAY"), NULL, NULL, NULL); diff --git a/Source/gui/ImageList.h b/Source/gui/ImageList.h index fda8bfc..6fc1c0f 100644 --- a/Source/gui/ImageList.h +++ b/Source/gui/ImageList.h @@ -33,6 +33,10 @@ class CP4ViewImageList : public CP4ImageList VI_OPENFOLDER, VI_YOURCHGUNRES, VI_YOUROTHERCHGUNRES, + VI_YOURCHANGE_SHELVED, + VI_THEIRCHANGE_SHELVED, + VI_YOURCHGUNRES_SHELVED, + VI_YOUROTHERCHGUNRES_SHELVED, VI_CLIENT, VI_CLIENT_CUR, VI_CLIENT_DEF, diff --git a/Source/gui/res/ViewIcons32.bmp b/Source/gui/res/ViewIcons32.bmp index 5a67251e2c728caa95869c27a4282b6bf05242a0..9505b0b67c1cfc3b4662bd98dd691af74ba52ec5 100644 GIT binary patch delta 584 zcmdn?fO*FoW^E^5i*F2IULfcOS81A_pNW@JzRk_-$?KzSi zya}5V`S0;DGEHWzG6Zs6Hiyc+f^jFX+idpL{RHJsG%(rhYV(s%lm%!Y2A-^7uQ$;^ zcCno|KLG_%{PNcslK#W+Wrl?RXn69&IgX3%GWq2nGi3aKarWl_ca!)1|J1PM|Ch22 z|G(s~`TsR*6-W<6T?N1V7lwlWFD~Ez|J`Ti|360k|Np3W{Qs-a3RVkO*Um5h$Drr` zvqz7?7^EI#_Um02z-HfNNQIa;jbHwk>ol+$kX_%y7ykcTz3KnAxMlx8bng8BlpzbK z&U3Td(jR>C--GAF4Fnl{jUf^28K5Gl!qCk@Ti)==e~VZIR`|Jg3z&Y#kO#IMWWZnP zW}u0&o1+dt;gf|aggFx^`5&a{kJ*I(ETBN1Y#{n{Gv8$cK3R}3NI6&<=rfp7aNK~D aZk`~qk_kvSFm4uls=__dfCFFDhywtS;1a0- delta 146 zcmdn-hI!iqW?3g+vkwelULfcOA21A_pNW@J#9+{o^;G4luC=7aqA_$I%%7uzf< z|B7#-1K;Lcy-z@zZSzsvpL~nueEApG#qck_m(9P}u9|=Gye|I5|7P+}bl}*Ww(Ej0Nxum+W-In From 750f3da96f83f12487259bb662e4f71560630656 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Fri, 20 Dec 2019 18:18:43 -0800 Subject: [PATCH 10/12] A bunch of work toward getting changelists with shelved files to show up as such in the delta tree. I've mostly found that I need to actually set the change as the lparam for the change tree item if we have one, otherwise we really don't have any context anywhere about anything. --- Source/gui/DeltaTreeCtrl.cpp | 262 ++++++++++++------------------- Source/gui/DeltaTreeCtrl.h | 4 + Source/gui/ImageList.cpp | 29 +++- Source/gui/ImageList.h | 2 + Source/gui/P4Change.cpp | 65 ++++++-- Source/gui/P4Change.h | 10 +- Source/gui/P4FileStats.cpp | 3 +- Source/gui/p4api/Cmd_Changes.cpp | 26 ++- Source/gui/p4api/Cmd_Changes.h | 2 + Source/gui/p4api/Cmd_Ostat.cpp | 4 + Source/gui/p4api/P4Command.h | 1 + 11 files changed, 234 insertions(+), 174 deletions(-) diff --git a/Source/gui/DeltaTreeCtrl.cpp b/Source/gui/DeltaTreeCtrl.cpp index f3fd89b..a923092 100644 --- a/Source/gui/DeltaTreeCtrl.cpp +++ b/Source/gui/DeltaTreeCtrl.cpp @@ -362,6 +362,27 @@ void CDeltaTreeCtrl::SaveExpansion() } } +CObject * CDeltaTreeCtrl::GetLParamObject(HTREEITEM curr_item) +{ + if ( !curr_item ) + return NULL; + + LPARAM lparam = GetLParam(curr_item); + if ( lparam == NULL || lparam == EXPAND_FOLDER || lparam == FOLDER_ALREADY_EXPANDED ) + return NULL; + + return (CObject *)lparam; +} + +template +TObject * CDeltaTreeCtrl::GetLParamTyped(HTREEITEM curr_item) +{ + CObject *pObject = GetLParamObject(curr_item); + if ( !pObject ) + return NULL; + + return dynamic_cast(pObject); +} BOOL CDeltaTreeCtrl::IsAFile(HTREEITEM curr_item) { @@ -371,10 +392,7 @@ BOOL CDeltaTreeCtrl::IsAFile(HTREEITEM curr_item) ASSERT(GetItemLevel(curr_item, &underMyRoot) == 2); #endif - if(GetLParam(curr_item) == NULL) - return(FALSE); - else - return(TRUE); + return GetLParamTyped(curr_item) != NULL; } UINT CDeltaTreeCtrl::GetItemState(HTREEITEM curr_item) @@ -443,10 +461,8 @@ void CDeltaTreeCtrl::DeleteItem(HTREEITEM item) { ASSERT(item != NULL); - LPARAM lParam=GetLParam(item); - if(lParam > 0) - delete (CP4FileStats *) lParam; - + delete GetLParamObject(item); + CMultiSelTreeCtrl::DeleteItem(item); } @@ -457,23 +473,16 @@ void CDeltaTreeCtrl::DeleteLParams(HTREEITEM root) HTREEITEM change= GetChildItem(root); HTREEITEM file; - LPARAM lParam; while(change != NULL) { file= GetChildItem(change); while(file != NULL) { - lParam=GetLParam(file); - if(lParam > 0) - { - ASSERT_KINDOF(CP4FileStats, (CP4FileStats *) lParam); - XTRACE(_T("CDeltaTreeCtrl::DeleteLParams: %s\n"), ((CP4FileStats *) lParam)->GetDepotFilename()); - delete (CP4FileStats *) lParam; - } - + delete GetLParamObject(file); file=GetNextSiblingItem(file); } + delete GetLParamObject(change); change=GetNextSiblingItem(change); } } @@ -497,7 +506,10 @@ void CDeltaTreeCtrl::InitList() CString rootName; rootName.FormatMessage(IDS_PENDING_CHANGELISTS_MY_CLIENT_s, GET_P4REGPTR()->GetP4Client()); m_MyRoot=Insert(rootName, CP4ViewImageList::VI_YOURPENDING, EXPAND_FOLDER, TVI_ROOT, TRUE); - m_MyDefault=Insert(LoadStringResource(IDS_DEFAULTCHANGELISTNAME), CP4ViewImageList::VI_YOURCHANGE, 0, m_MyRoot, TRUE); + + m_MyDefault=Insert(LoadStringResource(IDS_DEFAULTCHANGELISTNAME), 0, NULL, m_MyRoot, TRUE); + SetCorrectChglistImage( m_MyDefault ); + if (!m_DragToChangeNum) m_DragToChange=m_MyDefault; @@ -528,7 +540,7 @@ void CDeltaTreeCtrl::InitList() // in cases where that refresh will already be fetching the needed ifo (running opened -a) // The final lParam and child count values are handled after the refresh in UpdateTreeState if( m_OthersRootExpanded ) - m_OthersRoot=Insert(txt, CP4ViewImageList::VI_THEIRPENDING, FOLDER_ALREADY_EXPANDED, TVI_ROOT, TRUE); + m_OthersRoot=Insert(txt, CP4ViewImageList::VI_THEIRPENDING, NULL, TVI_ROOT, TRUE); else m_OthersRoot=Insert(txt, CP4ViewImageList::VI_THEIRPENDING, EXPAND_FOLDER, TVI_ROOT, TRUE); } @@ -976,44 +988,42 @@ LRESULT CDeltaTreeCtrl::OnP4AutoResolve(WPARAM wParam, LPARAM lParam) void CDeltaTreeCtrl::SetCorrectChglistImage(HTREEITEM change) { - HTREEITEM file= GetChildItem(change); + bool yourClient = true; // TODO - Figure out. + bool yourUser = true; // TODO - Figure out. + bool unresolved = false; + bool shelved = false; // TODO - Figure out. + + HTREEITEM file= GetChildItem(change); while(file != NULL) { - LPARAM lParam=GetLParam(file); - if(lParam > 0) + if ( CP4FileStats *stats = GetLParamTyped( file ) ) { - CP4FileStats *stats= (CP4FileStats *) lParam; - ASSERT_KINDOF(CP4FileStats, stats); - if (stats->IsUnresolved()) - { - int ix = stats->IsOtherUserMyClient() ? CP4ViewImageList::VI_YOUROTHERCHGUNRES - : CP4ViewImageList::VI_YOURCHGUNRES; - SetImage(change, ix, ix); - return; - } + unresolved = unresolved || stats->IsUnresolved(); } file=GetNextSiblingItem(file); } - SetImage(change, CP4ViewImageList::VI_YOURCHANGE, CP4ViewImageList::VI_YOURCHANGE); + + int ix = CP4ViewImageList::GetChangeIndex(yourClient, yourUser, unresolved, shelved); + + SetImage(change, ix, ix); } -void CDeltaTreeCtrl::ClearUnresolvedFlags( ) +void CDeltaTreeCtrl::ClearUnresolvedFlags() { HTREEITEM change= GetChildItem(m_MyRoot); HTREEITEM file; - LPARAM lParam; while(change != NULL) { - SetImage(change, CP4ViewImageList::VI_YOURCHANGE, CP4ViewImageList::VI_YOURCHANGE); + // TODO: Figure out shelved. + int ix = CP4ViewImageList::GetChangeIndex(true, true, false, false); + SetImage(change, ix, ix); + file= GetChildItem(change); while(file != NULL) { - lParam=GetLParam(file); - if(lParam > 0) + if ( CP4FileStats *stats = GetLParamTyped( file ) ) { - CP4FileStats *stats= (CP4FileStats *) lParam; - ASSERT_KINDOF(CP4FileStats, stats); stats->SetUnresolved(FALSE); int img=TheApp()->GetFileImageIndex(stats,TRUE); SetImage(file, img, img); @@ -1080,13 +1090,10 @@ LRESULT CDeltaTreeCtrl::OnP4Resolve(WPARAM wParam, LPARAM lParam) { CCmd_Resolve *pCmd= (CCmd_Resolve *) wParam; - if(!pCmd->GetError()) + if(!pCmd->GetError() && pCmd->GetResolved()) { - if(pCmd->GetResolved()) + if ( CP4FileStats *stats = GetLParamTyped( m_ActiveItem ) ) { - CP4FileStats *stats= (CP4FileStats *) GetLParam(m_ActiveItem); - ASSERT_KINDOF(CP4FileStats, stats); - stats->SetUnresolved(FALSE); stats->SetResolved(TRUE); int img=TheApp()->GetFileImageIndex(stats,TRUE); @@ -1126,10 +1133,8 @@ LRESULT CDeltaTreeCtrl::OnP4UnResolved(WPARAM wParam, LPARAM lParam) if( item != NULL ) { - LPARAM lParam= GetLParam(item); - if( lParam > 0 ) + if ( CP4FileStats *fs = GetLParamTyped( item ) ) { - CP4FileStats *fs= (CP4FileStats *) lParam; fs->SetUnresolved(TRUE); int img=TheApp()->GetFileImageIndex(fs,TRUE); SetImage(item, img, img); @@ -1177,12 +1182,8 @@ LRESULT CDeltaTreeCtrl::OnP4Resolved(WPARAM wParam, LPARAM lParam) if( item != NULL ) { - LPARAM lParam= GetLParam(item); - if( lParam > 0 ) - { - CP4FileStats *fs= (CP4FileStats *) lParam; + if ( CP4FileStats *fs = GetLParamTyped( item ) ) fs->SetResolved(TRUE); - } else ASSERT(0); } @@ -1342,10 +1343,7 @@ void CDeltaTreeCtrl::OnP4Reopen(CStringList *list) HTREEITEM item = NULL; int imageIndex = -1; - int ix = 0; - LPARAM param; - CP4FileStats *stats; - + SetRedraw(FALSE); for(pos=list->GetHeadPosition(); pos!=NULL;) { @@ -1367,9 +1365,8 @@ void CDeltaTreeCtrl::OnP4Reopen(CStringList *list) item=FindMyOpenFile(fileName, item); ASSERT(item != NULL); - if(item != NULL) + if ( CP4FileStats *stats = GetLParamTyped( item ) ) { - stats= (CP4FileStats *) GetLParam(item); stats->SetType(info.Mid(lstrlen(_T("type ")))); SetItemText(item, stats->GetFormattedChangeFile(GET_P4REGPTR()->ShowFileType(), GET_P4REGPTR()->ShowOpenAction())); int img=TheApp()->GetFileImageIndex(stats,TRUE); @@ -1386,22 +1383,16 @@ void CDeltaTreeCtrl::OnP4Reopen(CStringList *list) fileName = fileName.Left(i); item=GetChildItem(m_DragFromChange); - param=NULL; + CP4FileStats *stats = NULL; while(item != NULL) { - if(IsAFile(item)) + if ( stats = GetLParamTyped( item ) ) { - param= GetLParam(item); - ASSERT(param != 0); - stats= (CP4FileStats *) param; - ASSERT_KINDOF(CP4FileStats, stats); temp= stats->GetFullDepotPath(); if(temp == fileName) { imageIndex=GetImage(item); stats->SetOpenChangeNum( m_DragToChangeNum ); - ix = stats->IsOtherUserMyClient() ? CP4ViewImageList::VI_YOUROTHERCHANGE - : CP4ViewImageList::VI_YOURCHANGE; // reopen and update open file info // @@ -1436,15 +1427,7 @@ void CDeltaTreeCtrl::OnP4Reopen(CStringList *list) // And add under m_DragToChange if(item != NULL && imageIndex >= 0) { - item=Insert(temp, imageIndex, param, m_DragToChange, TRUE); - // we may have to reset the icon on the dragtochange because - // the Insert() is looking at data for the drag from change - // which might have been our client/other user. But we know - // the dragtochange is ours - so force it for unresolved files. - stats= (CP4FileStats *) GetLParam(item); - if (stats->IsUnresolved()) - SetImage(m_DragToChange, CP4ViewImageList::VI_YOURCHGUNRES, - CP4ViewImageList::VI_YOURCHGUNRES); + item=Insert(temp, imageIndex, (LPARAM)stats, m_DragToChange, TRUE); } ASSERT(item != NULL); }// if reopen by type or change @@ -1452,21 +1435,17 @@ void CDeltaTreeCtrl::OnP4Reopen(CStringList *list) if( !isReopenByType && list->GetCount() ) { - int img; // Make sure the source change is closed if it was just emptied if( GetChildItem(m_DragFromChange) == NULL ) { SetUnexpanded(m_DragFromChange); SetChildCount(m_DragFromChange, 0); SetLParam(m_DragFromChange, EXPAND_FOLDER); - SetImage(m_DragFromChange, ix, ix); - } - else if ((img = GetImage(m_DragFromChange)) == CP4ViewImageList::VI_YOURCHGUNRES - || img == CP4ViewImageList::VI_YOUROTHERCHGUNRES) - { - SetCorrectChglistImage(m_DragFromChange); } + SetCorrectChglistImage(m_DragFromChange); + SetCorrectChglistImage(m_DragToChange); + // Make sure the target change is openable if it contains children if( GetChildItem(m_DragToChange) != NULL ) { @@ -1818,13 +1797,11 @@ void CDeltaTreeCtrl::OnP4EditFile(CStringList *list) // And finally, update the item's status HTREEITEM item=FindMyOpenFile(fileName); - if(item != NULL) + if(CP4FileStats *stats = GetLParamTyped( item )) { - CP4FileStats *newStats; - CP4FileStats *stats= (CP4FileStats *) GetLParam(item); HTREEITEM change= GetParentItem(item); - newStats= new CP4FileStats; + CP4FileStats *newStats= new CP4FileStats; newStats->Create(stats); newStats->SetOpenAction(F_EDIT, FALSE); DeleteItem(item); @@ -1940,7 +1917,9 @@ LRESULT CDeltaTreeCtrl::OnP4EndSpecEdit( WPARAM wParam, LPARAM lParam ) // insert a new default change in the tree SetItemText(m_MyDefault, txt); - m_MyDefault=Insert(LoadStringResource(IDS_DEFAULTCHANGELISTNAME), CP4ViewImageList::VI_YOURCHANGE, NULL, m_MyRoot, TRUE); + m_MyDefault=Insert(LoadStringResource(IDS_DEFAULTCHANGELISTNAME), 0, NULL, m_MyRoot, TRUE); + SetCorrectChglistImage( m_MyDefault ); + if (!m_DragToChangeNum) m_DragToChange=m_MyDefault; } @@ -2584,10 +2563,8 @@ LRESULT CDeltaTreeCtrl::OnP4UpdateOpen(WPARAM wParam, LPARAM lParam) { case P4LOCK: case P4UNLOCK: - if(item != NULL) + if( oldStats = GetLParamTyped(item)) { - oldStats= (CP4FileStats *) GetLParam(item); - // update image and stats values oldStats->SetLocked(stats->IsMyLock(), FALSE); oldStats->SetLocked(FALSE, TRUE); @@ -2605,9 +2582,8 @@ LRESULT CDeltaTreeCtrl::OnP4UpdateOpen(WPARAM wParam, LPARAM lParam) case P4EDIT: case P4DELETE: case P4INTEG: - if(item != NULL) + if( oldStats = GetLParamTyped( item ) ) { - oldStats= (CP4FileStats *) GetLParam(item); if(stats->GetMyOpenAction() > 0) // Its in the tree and still open { // update image and stats values @@ -2733,10 +2709,9 @@ LRESULT CDeltaTreeCtrl::OnP4SetUnresolved(WPARAM wParam, LPARAM lParam) HTREEITEM item=FindMyOpenFile(stats->GetFullDepotPath()); - if(item != NULL) + if(CP4FileStats *oldStats = GetLParamTyped( item )) { // Found it, so see if unresolved - CP4FileStats *oldStats= (CP4FileStats *) GetLParam(item); if(oldStats->GetHaveRev() < stats->GetHaveRev()) oldStats->SetUnresolved(TRUE); oldStats->SetHaveRev(stats->GetHaveRev()); @@ -2931,24 +2906,28 @@ HTREEITEM CDeltaTreeCtrl::FindItemByText(LPCTSTR text) HTREEITEM CDeltaTreeCtrl::InsertChange(CP4FileStats *stats, BOOL searchFirst /*=TRUE*/) { HTREEITEM item, currentItem; - int imageIndex; BOOL sort = FALSE; + bool yourClient = true; + bool yourUser = true; + bool unresolved = stats->IsUnresolved(); + bool shelved = false; // TODO - Figure out. + // Directly assign the root node, based on change category - if( stats->IsOtherUserMyClient() ) + if( stats->IsOtherUserMyClient() ) { currentItem= m_MyRoot; - imageIndex = CP4ViewImageList::VI_YOUROTHERCHANGE; + yourClient = false; } else if(stats->IsMyOpen()) { currentItem= m_MyRoot; - imageIndex = CP4ViewImageList::VI_YOURCHANGE; } else if( m_OthersRoot ) { currentItem= m_OthersRoot; - imageIndex = CP4ViewImageList::VI_THEIRCHANGE; + yourClient = false; + yourUser = false; } else return NULL; @@ -3011,6 +2990,8 @@ HTREEITEM CDeltaTreeCtrl::InsertChange(CP4FileStats *stats, BOOL searchFirst /*= } } + int imageIndex = CP4ViewImageList::GetChangeIndex(yourClient, yourUser, unresolved, shelved); + item = Insert( changeName, imageIndex, 0, currentItem, sort); if (m_DragToChangeNum == changeNumber) m_DragToChange = item; @@ -3022,17 +3003,6 @@ HTREEITEM CDeltaTreeCtrl::Insert(LPCTSTR text, int imageIndex, LPARAM lParam, { XTRACE(_T("CDeltaTreeCtrl::Insert txt=%s\n"), text); - if( lParam > 0 ) - { - CP4FileStats *fs= (CP4FileStats *) lParam; - if (fs->IsUnresolved()) - { - int ix = fs->IsOtherUserMyClient() ? CP4ViewImageList::VI_YOUROTHERCHGUNRES - : CP4ViewImageList::VI_YOURCHGUNRES; - SetImage(hParent, ix, ix); - } - } - // Add an entry to the tree TV_INSERTSTRUCT tree_insert; tree_insert.hInsertAfter= sort ? TVI_SORT : TVI_FIRST; @@ -3133,24 +3103,19 @@ LRESULT CDeltaTreeCtrl::OnP4Change(WPARAM wParam, LPARAM lParam) HTREEITEM item; if(change->IsMyChange()) { - // Its my client, but maybe not my user - if( Compare( change->GetUser(), GET_P4REGPTR()->GetMyID()) == 0 ) - item=Insert(change->GetFormattedChange(GET_P4REGPTR()->ShowChangeDesc(), - GET_P4REGPTR()->SortChgsByUser()), - CP4ViewImageList::VI_YOURCHANGE, NULL, m_MyRoot, TRUE); - else - item=Insert(change->GetFormattedChange(GET_P4REGPTR()->ShowChangeDesc(), - GET_P4REGPTR()->SortChgsByUser()), - CP4ViewImageList::VI_YOUROTHERCHANGE, NULL, m_MyRoot, TRUE); + item=Insert(change->GetFormattedChange(GET_P4REGPTR()->ShowChangeDesc(), GET_P4REGPTR()->SortChgsByUser()), 0, NULL, m_MyRoot, TRUE); } else if (m_OthersRoot) { - item=Insert(change->GetFormattedChange(GET_P4REGPTR()->ShowChangeDesc(), - GET_P4REGPTR()->SortChgsByUser()), - CP4ViewImageList::VI_THEIRCHANGE, NULL, m_OthersRoot, TRUE); + item=Insert(change->GetFormattedChange(GET_P4REGPTR()->ShowChangeDesc(), GET_P4REGPTR()->SortChgsByUser()), 0, NULL, m_OthersRoot, TRUE); } else item = NULL; + if ( item ) + { + SetCorrectChglistImage( item ); + } + if( change->GetChangeNumber() > 0 && item ) SetChildCount( item, 1 ); } @@ -3975,17 +3940,11 @@ LRESULT CDeltaTreeCtrl::OnP4ChangeDescribe(WPARAM wParam, LPARAM lParam) CString fileText; while( child != NULL ) { - if( IsAFile( child ) ) + if( CP4FileStats *fs= GetLParamTyped(child) ) { - CP4FileStats *fs= (CP4FileStats *) GetLParam(child); - if( fs->IsMyOpen() ) - fileText.Format(_T("\r\n%s#%d %s"), fs->GetFullDepotPath(), - fs->GetHaveRev(), - fs->GetActionStr( fs->GetMyOpenAction() ) ); - else - fileText.Format(_T("\r\n%s#%d %s"), fs->GetFullDepotPath(), - fs->GetHaveRev(), - fs->GetActionStr( fs->GetOtherOpenAction() ) ); + fileText.Format(_T("\r\n%s#%d %s"), fs->GetFullDepotPath(), + fs->GetHaveRev(), + fs->GetActionStr( fs->IsMyOpen() ? fs->GetMyOpenAction() : fs->GetOtherOpenAction() ) ); // do reallocs in large chunks, rather than letting CString::operator +=() do it // in little bits. This makes a huge speed difference if the number if items is large. @@ -4178,7 +4137,7 @@ void CDeltaTreeCtrl::ChangeEdit(long chgnum /*= -1*/, HTREEITEM chgItem /*= 0*/) item=GetChildItem(m_EditChange); while(item!=NULL) { - if(IsAFile(item)) + if(CP4FileStats *stats = GetLParamTyped(item)) { fileName=GetItemText(item); if ((m_SubmitOnlyChged || GET_SERVERLEVEL() >= 21) //always build list for 6.1+ @@ -4188,8 +4147,6 @@ void CDeltaTreeCtrl::ChangeEdit(long chgnum /*= -1*/, HTREEITEM chgItem /*= 0*/) { if (b20051) // working with good 2005.1 or later server? { - LPARAM lParam=GetLParam(item); - CP4FileStats *stats = (CP4FileStats *) lParam; if (TheApp()->digestIsSame(stats, FALSE, client) && stats->GetType() == stats->GetHeadType()) m_FileList.AddTail(stats->GetFullDepotPath()); @@ -4502,8 +4459,7 @@ void CDeltaTreeCtrl::OnFiletype() else { CFileType dlg; - CP4FileStats *stats; - stats= (CP4FileStats *) GetLParam(item); + CP4FileStats *stats = GetLParamTyped(item); dlg.m_itemStr = stats->GetFormattedChangeFile(TRUE, TRUE); INT_PTR i=GetSelectedCount(); if (i > 1) @@ -5725,7 +5681,7 @@ void CDeltaTreeCtrl::OnContextMenu(CWnd* pWnd, CPoint point) { if (!SERVER_BUSY() && GET_SERVERLEVEL() >= 14 && GetSelectedCount()==1) { - CP4FileStats *fs= (CP4FileStats *) GetLParam( GetSelectedItem(0) ); + CP4FileStats *fs= GetLParamTyped( GetSelectedItem(0) ); BOOL enable = ( fs->GetHaveRev() <= 1 && ( fs->GetMyOpenAction() == F_ADD || fs->GetMyOpenAction() == F_BRANCH ) ) ? FALSE : TRUE; @@ -5940,7 +5896,7 @@ void CDeltaTreeCtrl::OnUpdateFileRevisionhistory(CCmdUI* pCmdUI) IsAFile( GetSelectedItem(0)) ); if( enable ) { - CP4FileStats *fs= (CP4FileStats *) GetLParam( GetSelectedItem(0) ); + CP4FileStats *fs= GetLParamTyped( GetSelectedItem(0) ); if( fs->GetHaveRev() <= 1 && ( fs->GetMyOpenAction() == F_ADD || fs->GetMyOpenAction() == F_BRANCH ) ) enable= FALSE; @@ -5957,7 +5913,7 @@ void CDeltaTreeCtrl::OnUpdateFileAnnotate(CCmdUI* pCmdUI) && IsAFile( GetSelectedItem(0) ); if( enable ) { - CP4FileStats *fs= (CP4FileStats *) GetLParam( GetSelectedItem(0) ); + CP4FileStats *fs= GetLParamTyped( GetSelectedItem(0) ); if( fs->GetHaveRev() <= 1 && ( fs->GetMyOpenAction() == F_ADD || fs->GetMyOpenAction() == F_BRANCH ) ) enable= FALSE; @@ -6108,6 +6064,7 @@ BOOL CDeltaTreeCtrl::IsMyPendingChange(HTREEITEM currentItem) if(level==1 && underMyRoot) { + // TODO: Figure out. if( GetImage( currentItem) != CP4ViewImageList::VI_YOUROTHERCHANGE ) myChange= TRUE; } @@ -6167,18 +6124,7 @@ BOOL CDeltaTreeCtrl::IsMyPendingChangeFile(HTREEITEM currentItem) BOOL CDeltaTreeCtrl::IsMyPendingChangeItem(HTREEITEM currentItem) { - BOOL myItem= FALSE; - BOOL underMyRoot; - int level= GetItemLevel(currentItem, &underMyRoot); - - if(level==2 && underMyRoot) - { - HTREEITEM changeItem= GetParentItem(currentItem); - if( GetImage( changeItem ) != CP4ViewImageList::VI_YOUROTHERCHANGE ) - myItem= TRUE; - } - - return myItem; + return currentItem && IsMyPendingChange(GetParentItem(currentItem)); } BOOL CDeltaTreeCtrl::IsSelectionSubmittableChange() @@ -6338,7 +6284,7 @@ BOOL CDeltaTreeCtrl::AnyMyLock() { for(INT_PTR i=GetSelectedCount()-1; i>=0; i--) { - stats= (CP4FileStats *) GetLParam(GetSelectedItem(i)); + stats= GetLParamTyped( GetSelectedItem(i) ); if(stats != NULL) { if(stats->IsMyLock()) @@ -6368,7 +6314,7 @@ BOOL CDeltaTreeCtrl::AnyMyUnLocked() { for(INT_PTR i=GetSelectedCount()-1; i>=0; i--) { - stats= (CP4FileStats *) GetLParam(GetSelectedItem(i)); + stats= GetLParamTyped( GetSelectedItem(i) ); if(stats != NULL) { if(!stats->IsMyLock()) @@ -6418,7 +6364,7 @@ BOOL CDeltaTreeCtrl::AnyBinaryFiles(BOOL bAnyResolvable/*=FALSE*/) { if (bAnyResolvable) { - CP4FileStats *stats = (CP4FileStats *) GetLParam(GetSelectedItem(i)); + CP4FileStats *stats = GetLParamTyped( GetSelectedItem(i) ); if(stats != NULL) { if (!stats->IsUnresolved() && !stats->IsResolved()) @@ -6449,7 +6395,7 @@ BOOL CDeltaTreeCtrl::AnyUnresolvedFiles() { for(INT_PTR i=GetSelectedCount()-1; i>=0; i--) { - stats= (CP4FileStats *) GetLParam(GetSelectedItem(i)); + stats= GetLParamTyped( GetSelectedItem(i) ); if(stats != NULL) { if(stats->IsUnresolved()) @@ -6480,7 +6426,7 @@ BOOL CDeltaTreeCtrl::AnyResolvedFiles(BOOL bList/*=FALSE*/) { for(INT_PTR i=GetSelectedCount()-1; i>=0; i--) { - stats= (CP4FileStats *) GetLParam(GetSelectedItem(i)); + stats= GetLParamTyped( GetSelectedItem(i) ); if(stats != NULL) { if(stats->IsResolved()) @@ -7915,7 +7861,7 @@ void CDeltaTreeCtrl::OnUpdateFileInformation(CCmdUI* pCmdUI) IsAFile( GetSelectedItem(0)) ); if( enable ) { - CP4FileStats *fs= (CP4FileStats *) GetLParam( GetSelectedItem(0) ); + CP4FileStats *fs= GetLParamTyped( GetSelectedItem(0) ); if( fs->GetHaveRev() <= 1 && ( fs->GetMyOpenAction() == F_ADD || fs->GetMyOpenAction() == F_BRANCH ) ) enable= FALSE; diff --git a/Source/gui/DeltaTreeCtrl.h b/Source/gui/DeltaTreeCtrl.h index f402bf8..0ea9e68 100644 --- a/Source/gui/DeltaTreeCtrl.h +++ b/Source/gui/DeltaTreeCtrl.h @@ -316,6 +316,10 @@ class CDeltaTreeCtrl : public CMultiSelTreeCtrl BOOL GetSelectedFiles( CStringList *list ); int GetItemLevel(HTREEITEM currentItem, BOOL *underMyRoot); BOOL IsAFile(HTREEITEM curr_item); + CObject * GetLParamObject(HTREEITEM curr_item); + + template + TObject * GetLParamTyped(HTREEITEM curr_item); BOOL AnyInDefault(); BOOL AnyNbredChg(); diff --git a/Source/gui/ImageList.cpp b/Source/gui/ImageList.cpp index 1c16cb5..526b0f6 100644 --- a/Source/gui/ImageList.cpp +++ b/Source/gui/ImageList.cpp @@ -139,6 +139,31 @@ int CP4ViewImageList::GetFileIndex(int state) return result; } +// return composite image index for change flags +int CP4ViewImageList::GetChangeIndex(bool yourClient, bool yourUser, bool unresolved, bool shelved) +{ + if ( yourClient && yourUser ) + { + if ( unresolved ) + return shelved ? VI_YOURCHGUNRES_SHELVED : VI_YOURCHGUNRES; + else + return shelved ? VI_YOURCHANGE_SHELVED : VI_YOURCHANGE; + } + else if ( yourUser ) + { + if ( unresolved ) + return shelved ? VI_YOUROTHERCHGUNRES_SHELVED : VI_YOUROTHERCHGUNRES; + else + return shelved ? VI_YOUROTHERCHANGE_SHELVED : VI_YOUROTHERCHANGE; + } + else + { + // We shouldn't ever hear about other folks' unresolved changes. + ASSERT( !unresolved ); + return shelved ? VI_THEIRCHANGE_SHELVED : VI_THEIRCHANGE; + } +} + // create a composite client or user image static void AddCUImage(CP4Image &dst, CP4Image &src, int &x, int layers) { @@ -249,6 +274,8 @@ void CP4ViewImageList::MakeBitmap(CP4Image &dst, CP4Image &src, COLORREF bg) dst.BlendImage(i++, src, SI_SHELVED); dst.BlendImage(i, src, CP4ViewImageList::VI_THEIRCHANGE); dst.BlendImage(i++, src, SI_SHELVED); + dst.BlendImage(i, src, CP4ViewImageList::VI_YOUROTHERCHANGE); + dst.BlendImage(i++, src, SI_SHELVED); // same, but for shelved + not synced case dst.BlendImage(i, src, CP4ViewImageList::VI_YOURCHANGE); @@ -295,7 +322,7 @@ bool CP4ViewImageList::Create() 1 + // open folder 2 + // 2 unresolved pending chglists 2 + // 2 unresolved + shelved pending changelists - 2 ); // your/their change with shelved files + 3 ); // your/their/your other change with shelved files CDC dc; dc.CreateDC(_T("DISPLAY"), NULL, NULL, NULL); diff --git a/Source/gui/ImageList.h b/Source/gui/ImageList.h index 6fc1c0f..e0498fa 100644 --- a/Source/gui/ImageList.h +++ b/Source/gui/ImageList.h @@ -35,6 +35,7 @@ class CP4ViewImageList : public CP4ImageList VI_YOUROTHERCHGUNRES, VI_YOURCHANGE_SHELVED, VI_THEIRCHANGE_SHELVED, + VI_YOUROTHERCHANGE_SHELVED, VI_YOURCHGUNRES_SHELVED, VI_YOUROTHERCHGUNRES_SHELVED, VI_CLIENT, @@ -78,6 +79,7 @@ class CP4ViewImageList : public CP4ImageList static int GetClientIndex(bool isCurrent, bool isDefault); static int GetUserIndex(bool isCurrent, bool isDefault); static int GetFileIndex(int state); + static int GetChangeIndex(bool yourClient, bool yourUser, bool unresolved, bool shelved); }; class CP4WinToolBarImageList : public CP4ToolBarImageList diff --git a/Source/gui/P4Change.cpp b/Source/gui/P4Change.cpp index 2146d6f..828fac7 100644 --- a/Source/gui/P4Change.cpp +++ b/Source/gui/P4Change.cpp @@ -32,7 +32,7 @@ CP4Change::~CP4Change() // Eat a row of text from 'P4 changes' that looks like: // Change 2698 on 02/01/1997 by NIRIAS@ELWOOD *pending* 'Another change -BOOL CP4Change::Create(LPCTSTR changesRow, LPCTSTR currentUser) +BOOL CP4Change::Create(LPCTSTR changesRow) { CTokenString str; str.Create(changesRow); @@ -54,14 +54,13 @@ BOOL CP4Change::Create(LPCTSTR changesRow, LPCTSTR currentUser) } VERIFY(lstrcmp(temp, _T("by"))==0); // Skip over word, 'by' - m_User=str.GetToken(); - ASSERT(m_User.Find(_T("@"))); + m_UserAtClient=str.GetToken(); m_MyChange=FALSE; - int at= m_User.Find(_T("@")); + int at= m_UserAtClient.Find(_T("@")); if( at == -1) ASSERT(0); - else if( Compare( m_User.Mid( at+1 ), GET_P4REGPTR()->GetP4Client() ) == 0 ) + else if( Compare( m_UserAtClient.Mid( at+1 ), GET_P4REGPTR()->GetP4Client() ) == 0 ) m_MyChange=TRUE; LPTSTR token=str.GetToken(); @@ -101,6 +100,52 @@ BOOL CP4Change::Create(LPCTSTR changesRow, LPCTSTR currentUser) return TRUE; } +static void TimestampToFormattedTime( long changeTime, CString *pFormatted ) +{ + // There's some weird negative number math going on in CP4FileStats::GetFormattedHeadTime() + ASSERT(changeTime >= 0); + + struct tm *t = _localtime32( (const __time32_t *)&changeTime ); + pFormatted->Format(_T("%04d/%02d/%02d %02d:%02d:%02d"), + t->tm_year+1900, t->tm_mon+1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); +} + +BOOL CP4Change::Create(StrDict *varlist) +{ + StrPtr *str; + + VERIFY( str = varlist->GetVar( "change" ) ); + m_ChangeNumber = atol(!str ? "" : str->Value()); + ASSERT(m_ChangeNumber); + + VERIFY( str = varlist->GetVar( "time" ) ); + TimestampToFormattedTime( atol(!str ? "0" : str->Value()), &m_ChangeDate ); + + VERIFY( str = varlist->GetVar( "user" ) ); + m_UserAtClient = CharToCString(!str ? "" : str->Value()); + + m_UserAtClient.AppendChar( L'@' ); + + VERIFY( str = varlist->GetVar( "client" ) ); + m_UserAtClient.Append( CharToCString(!str ? "" : str->Value()) ); + + CString sClient = !str ? "" : str->Value(); + m_MyChange = ( Compare( sClient, GET_P4REGPTR()->GetP4Client() ) == 0 ); + + VERIFY( str = varlist->GetVar( "status" ) ); + m_Pending = (strcmp(!str ? "" : str->Value(), "pending")==0); + + str = varlist->GetVar( "shelved" ); + m_Shelved = (str != NULL); + + VERIFY( str = varlist->GetVar( "desc" ) ); + m_Description = !str ? "" : str->Value(); + + m_Initialized=TRUE; + return TRUE; +} + CString CP4Change::GetFormattedChange(BOOL showChangeDesc, BOOL sortByUser) const { ASSERT(m_Initialized); @@ -135,7 +180,7 @@ CString CP4Change::GetFormattedChange(BOOL showChangeDesc, BOOL sortByUser) cons txtout.ReleaseBuffer(); } - if( Compare( m_User, GET_P4REGPTR()->GetMyID() ) == 0 ) + if( Compare( m_UserAtClient, GET_P4REGPTR()->GetMyID() ) == 0 ) { if(showChangeDesc) { @@ -151,17 +196,17 @@ CString CP4Change::GetFormattedChange(BOOL showChangeDesc, BOOL sortByUser) cons { if(showChangeDesc) txt.FormatMessage(!bTrunc ? IDS_CHANGE_s_n_s : IDS_CHANGE_s_n_s_TRUNC, - m_User, m_ChangeNumber, desc); + m_UserAtClient, m_ChangeNumber, desc); else - txt.FormatMessage(IDS_CHANGE_USER_s_n, m_User, m_ChangeNumber); + txt.FormatMessage(IDS_CHANGE_USER_s_n, m_UserAtClient, m_ChangeNumber); } else { if(showChangeDesc) txt.FormatMessage(!bTrunc ? IDS_CHANGE_n_s_s : IDS_CHANGE_n_s_s_TRUNC, - m_ChangeNumber, m_User, desc); + m_ChangeNumber, m_UserAtClient, desc); else - txt.FormatMessage(IDS_CHANGE_n_s, m_ChangeNumber, m_User); + txt.FormatMessage(IDS_CHANGE_n_s, m_ChangeNumber, m_UserAtClient); } } diff --git a/Source/gui/P4Change.h b/Source/gui/P4Change.h index cbacb5b..3c445ea 100644 --- a/Source/gui/P4Change.h +++ b/Source/gui/P4Change.h @@ -20,7 +20,7 @@ class CP4Change : public CObject protected: long m_ChangeNumber; CString m_ChangeDate; - CString m_User; + CString m_UserAtClient; // user@client BOOL m_Initialized; BOOL m_Pending; BOOL m_Shelved; @@ -28,18 +28,22 @@ class CP4Change : public CObject CString m_Description; public: - BOOL Create(LPCTSTR changesRow, LPCTSTR currentUser); // char * as returned by 'p4 changes' + BOOL Create(LPCTSTR changesRow); // char * as returned by 'p4 changes' + BOOL Create(class StrDict *varlist); inline BOOL IsPending() const {ASSERT(m_Initialized); return m_Pending;} + inline BOOL IsShelved() const {ASSERT(m_Initialized); return m_Shelved;} inline BOOL IsMyChange() const {ASSERT(m_Initialized); return m_MyChange;} CString GetFormattedChange(BOOL showChangeDesc, BOOL sortByUser) const; inline long GetChangeNumber() const { ASSERT(m_Initialized); return m_ChangeNumber; } inline LPCTSTR GetChangeDate() const { ASSERT(m_Initialized); return LPCTSTR(m_ChangeDate); } - inline LPCTSTR GetUser() const { ASSERT(m_Initialized); return LPCTSTR(m_User); } + inline LPCTSTR GetUser() const { ASSERT(m_Initialized); return LPCTSTR(m_UserAtClient); } inline LPCTSTR GetDescription() const { ASSERT(m_Initialized); return LPCTSTR(m_Description); } inline void SetDescription(LPCTSTR str) { ASSERT(m_Initialized); m_Description = str; } + inline void SetShelved( BOOL shelved ) { ASSERT(m_Initialized); m_Shelved = shelved; } + ~CP4Change(); }; diff --git a/Source/gui/P4FileStats.cpp b/Source/gui/P4FileStats.cpp index 07cec23..6eb7773 100644 --- a/Source/gui/P4FileStats.cpp +++ b/Source/gui/P4FileStats.cpp @@ -725,7 +725,8 @@ CString CP4FileStats::GetFormattedHeadTime() { if(m_HeadTime < 0) m_HeadTime = -m_HeadTime; - t = localtime( (const time_t *)&m_HeadTime ); + + t = _localtime32( (const __time32_t *)&m_HeadTime ); time.Format(_T("%04d/%02d/%02d %02d:%02d:%02d"), t->tm_year+1900, t->tm_mon+1, t->tm_mday, diff --git a/Source/gui/p4api/Cmd_Changes.cpp b/Source/gui/p4api/Cmd_Changes.cpp index 514f300..8a706c2 100644 --- a/Source/gui/p4api/Cmd_Changes.cpp +++ b/Source/gui/p4api/Cmd_Changes.cpp @@ -45,6 +45,10 @@ BOOL CCmd_Changes::Run(ECmdChangesFilter filter, int loquatious, CStringList *vi ClearArgs(); m_BaseArgs= AddArg(_T("changes")); + // We use the tagged output in order to detected shelved changelists. + // Luckily shelving isn't supported until server level 28. + m_UsedTagged = GET_SERVERLEVEL() >= 8 ? TRUE : FALSE; + // May only want numToFetch most recent changes if(numToFetch > 0) { @@ -83,9 +87,12 @@ BOOL CCmd_Changes::Run(ECmdChangesFilter filter, int loquatious, CStringList *vi if (GET_SERVERLEVEL() >= 16) m_BaseArgs= AddArg(_T("-t")); } + else if(filter == SHELVED_CHANGES) + AddArg(_T("shelved")); else ASSERT(0); } + m_pBatch= new CObList; // We may or may not have a view spec to limit the fetching of @@ -97,6 +104,7 @@ BOOL CCmd_Changes::Run(ECmdChangesFilter filter, int loquatious, CStringList *vi m_posStrListIn= m_pStrListIn->GetHeadPosition(); NextListArgs(); } + return CP4Command::Run(); } @@ -104,7 +112,7 @@ void CCmd_Changes::OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg) { // Parse into a CP4Change and send that back CP4Change *change= new CP4Change; - if( change->Create(data, GET_P4REGPTR()->GetMyID()) ) + if( change->Create(data) ) m_Changes.Add(change); else { @@ -117,6 +125,22 @@ void CCmd_Changes::OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg) } } +void CCmd_Changes::OnOutputStat( StrDict *varList ) +{ + CP4Change *change= new CP4Change; + if( change->Create(varList) ) + m_Changes.Add(change); + else + { + #ifdef _DEBUG + CString errMsg; + errMsg.Format(_T("Change parse failed (tagged output)")); + TheApp()->StatusAdd(errMsg, SV_DEBUG); + #endif + delete change; + } +} + void CCmd_Changes::PostProcess() { // First, sort the changes in decending order diff --git a/Source/gui/p4api/Cmd_Changes.h b/Source/gui/p4api/Cmd_Changes.h index cd44a7e..2cdd39c 100644 --- a/Source/gui/p4api/Cmd_Changes.h +++ b/Source/gui/p4api/Cmd_Changes.h @@ -13,6 +13,7 @@ enum ECmdChangesFilter ALL_CHANGES = 1, PENDING_CHANGES = 2, SUBMITTED_CHANGES = 3, + SHELVED_CHANGES = 4, }; @@ -36,6 +37,7 @@ class CCmd_Changes : public CP4Command // CP4Command overrides virtual void OnOutputInfo(char level, LPCTSTR data, LPCTSTR msg); + virtual void OnOutputStat( StrDict *varList ); virtual void PostProcess(); }; diff --git a/Source/gui/p4api/Cmd_Ostat.cpp b/Source/gui/p4api/Cmd_Ostat.cpp index 6a731d2..ab7cc88 100644 --- a/Source/gui/p4api/Cmd_Ostat.cpp +++ b/Source/gui/p4api/Cmd_Ostat.cpp @@ -213,6 +213,10 @@ void CCmd_Ostat::PreProcess(BOOL& done) } } + // Look for any changelists with shelved files. + // p4 changes? + // user-fstat -Op -Rs -e 4758996 //...' + if( !m_FatalError && m_OpenArray.GetSize() > 0 ) // Sort the results from opened SortOpened(); diff --git a/Source/gui/p4api/P4Command.h b/Source/gui/p4api/P4Command.h index ef7ec89..cce915e 100644 --- a/Source/gui/p4api/P4Command.h +++ b/Source/gui/p4api/P4Command.h @@ -167,6 +167,7 @@ #define WM_DOLABELSYNC WM_USER+323 #define WM_ONDODELETEFIXES WM_USER+324 #define WM_UPDATEHAVEREV WM_USER+325 +#define WM_P4CHANGESSHELVED WM_USER+326 #define WM_P4UPPERBOUND WM_USER+398 // Used to test command values only, not a command #define WM_P4STATUS WM_USER+399 From e4057e1054f32b0931f801a0ed7ad2490c340b04 Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Wed, 8 Jan 2020 11:09:17 -0800 Subject: [PATCH 11/12] Added a checkbox for gating all of the jobs-related work. It's hooked up to a couple of menu options (so they hide) but we don't use any of the jobs/fixes stuff so I'd like to get it out of my sight and figured this was the most appropriate way to do this. --- Source/gui/DeltaTreeCtrl.cpp | 31 +- Source/gui/OldChgListCtrl.cpp | 9 +- Source/gui/OptionsDlg/JobsPage.cpp | 31 + Source/gui/OptionsDlg/JobsPage.h | 4 +- Source/gui/P4Registry.cpp | 12 + Source/gui/P4Registry.h | 3 + Source/gui/P4Win409/P4Win409.rc | 2311 ++++++++++---------------- Source/gui/P4Win409/P4Win409.vcxproj | 1 + Source/gui/SpecDescDlg.cpp | 2 +- Source/gui/resource.h | 20 +- 10 files changed, 942 insertions(+), 1482 deletions(-) diff --git a/Source/gui/DeltaTreeCtrl.cpp b/Source/gui/DeltaTreeCtrl.cpp index a923092..baaaef7 100644 --- a/Source/gui/DeltaTreeCtrl.cpp +++ b/Source/gui/DeltaTreeCtrl.cpp @@ -2254,18 +2254,21 @@ BOOL CDeltaTreeCtrl::ExpandTree( const HTREEITEM item ) if ( changeNum <= 0 ) return TRUE; - // D) And finally fire up fixes - CCmd_Fixes *pCmdFixes= new CCmd_Fixes; - pCmdFixes->Init( m_hWnd, RUN_ASYNC); - if( pCmdFixes->Run(changeNum, item) ) + // D) And finally fire up fixes, if enabled + if ( GET_P4REGPTR()->GetJobsEnabled() ) { - MainFrame()->UpdateStatus( LoadStringResource(IDS_UPDATING_JOB_FIXES) ); - } - else - { - delete pCmdFixes; - RedrawWindow(); - MainFrame()->ClearStatus(); + CCmd_Fixes *pCmdFixes= new CCmd_Fixes; + pCmdFixes->Init( m_hWnd, RUN_ASYNC); + if( pCmdFixes->Run(changeNum, item) ) + { + MainFrame()->UpdateStatus( LoadStringResource(IDS_UPDATING_JOB_FIXES) ); + } + else + { + delete pCmdFixes; + RedrawWindow(); + MainFrame()->ClearStatus(); + } } return TRUE; @@ -5555,7 +5558,11 @@ void CDeltaTreeCtrl::OnContextMenu(CWnd* pWnd, CPoint point) { popMenu.AppendMenu( stringsON, ID_CHANGE_EDSPEC, LoadStringResource( IDS_EDITSPEC ) ); popMenu.AppendMenu( stringsON, ID_CHANGE_DESCRIBE, LoadStringResource( IDS_DESCRIBEIT ) ); - popMenu.AppendMenu( stringsON, ID_CHANGE_ADDJOBFIX, LoadStringResource( IDS_ADDJOBFIX ) ); + + if ( GET_P4REGPTR()->GetJobsEnabled() ) + { + popMenu.AppendMenu( stringsON, ID_CHANGE_ADDJOBFIX, LoadStringResource( IDS_ADDJOBFIX ) ); + } } // Choice for empty changes if not default diff --git a/Source/gui/OldChgListCtrl.cpp b/Source/gui/OldChgListCtrl.cpp index ed66bd9..87e2f8b 100644 --- a/Source/gui/OldChgListCtrl.cpp +++ b/Source/gui/OldChgListCtrl.cpp @@ -684,8 +684,13 @@ void COldChgListCtrl::OnContextMenu(CWnd* pWnd, CPoint point) { popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_EDSPEC, LoadStringResource( IDS_EDIT ) ); popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_DESCRIBE, LoadStringResource( ID_CHANGE_DESCRIBE ) ); - popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_ADDJOBFIX, LoadStringResource( IDS_ADDJOBFIX ) ); - popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_REMOVEFIX, LoadStringResource( IDS_CHANGE_REMOVEFIX ) ); + + if ( GET_P4REGPTR()->GetJobsEnabled() ) + { + popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_ADDJOBFIX, LoadStringResource( IDS_ADDJOBFIX ) ); + popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_CHANGE_REMOVEFIX, LoadStringResource( IDS_CHANGE_REMOVEFIX ) ); + } + popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_SYNC_CHANGE, LoadStringResource( IDS_SYNC_CHANGE ) ); popMenu.AppendMenu(MF_ENABLED | MF_STRING, ID_POSITIONDEPOT, LoadStringResource( IDS_FINDCHGFILESINDEPOT ) ); integMenu.AppendMenu( stringsON, ID_FILE_INTEGSPEC, LoadStringResource( IDS_USINGFILESPEC ) ); diff --git a/Source/gui/OptionsDlg/JobsPage.cpp b/Source/gui/OptionsDlg/JobsPage.cpp index f1c5db8..c6ae51e 100644 --- a/Source/gui/OptionsDlg/JobsPage.cpp +++ b/Source/gui/OptionsDlg/JobsPage.cpp @@ -41,6 +41,7 @@ void CJobsPage::DoDataExchange(CDataExchange* pDX) //{{AFX_DATA_MAP(CJobsPage) DDX_Control(pDX, IDC_POLLJOBS, m_PollJobs); DDX_Control(pDX, IDC_FETCHALLJOBS_RAD, m_JobCountRadio); + DDX_Control(pDX, IDC_ENABLEJOBS, m_JobsEnabledCheckbox); DDX_Text(pDX, IDC_JOBCOUNT, m_JobCount); DDV_MinMaxInt(pDX, m_JobCount, 0, 1000000); //}}AFX_DATA_MAP @@ -53,6 +54,7 @@ BEGIN_MESSAGE_MAP(CJobsPage, CPropertyPage) ON_BN_CLICKED(IDC_FETCHALLJOBS_RAD, OnFetchRadio) ON_BN_CLICKED(IDC_FETCHXJOBS_RAD, OnFetchRadio) ON_BN_CLICKED(ID_JOB_CONFIGURE, OnJobConfigure) + ON_BN_CLICKED(IDC_ENABLEJOBS, OnEnableCheckbox) END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -67,6 +69,7 @@ BOOL CJobsPage::OnInitDialog() // Init all data members from the registry m_JobCount = GET_P4REGPTR()->GetFetchJobCount(); m_JobCountRadio.SetCheck(GET_P4REGPTR()->GetFetchAllJobs()); + m_JobsEnabledCheckbox.SetCheck(GET_P4REGPTR()->GetJobsEnabled()); if(!GET_P4REGPTR()->GetFetchAllJobs()) { CButton otherButton; @@ -77,6 +80,9 @@ BOOL CJobsPage::OnInitDialog() // Enable/disable fetch change count per radio button OnFetchRadio(); + + // Same, but for the overall enabling checkbox + OnEnableCheckbox(); // Init the jobs polling flag m_PollJobs.SetCheck(GET_P4REGPTR()->GetAutoPollJobs()); @@ -105,6 +111,24 @@ void CJobsPage::OnFetchRadio() pwnd->EnableWindow(FALSE); } +void CJobsPage::OnEnableCheckbox() +{ + bool bJobsEnabled = m_JobsEnabledCheckbox.GetCheck() != 0; + + const int nDisableEnable[] = { + IDC_FETCHALLJOBS_RAD, + IDC_FETCHXJOBS_RAD, + IDC_JOBCOUNT, + IDC_POLLJOBS, + ID_JOB_CONFIGURE, + }; + + for ( int nID : nDisableEnable ) + { + GetDlgItem(nID)->EnableWindow( bJobsEnabled ? TRUE : FALSE ); + } +} + void CJobsPage::OnJobConfigure() { MainFrame()->OnJobConfigure(); @@ -123,6 +147,13 @@ void CJobsPage::OnOK() if( UpdateData( TRUE ) ) { + BOOL enableState=TRUE; + if(m_JobsEnabledCheckbox.GetCheck() == 0) + enableState=FALSE; + if( enableState != GET_P4REGPTR()->GetJobsEnabled() ) + if(!GET_P4REGPTR()->SetJobsEnabled( enableState ) ) + m_ErrorCount++; + BOOL jobsState=TRUE; if(m_PollJobs.GetCheck() == 0) jobsState=FALSE; diff --git a/Source/gui/OptionsDlg/JobsPage.h b/Source/gui/OptionsDlg/JobsPage.h index f3359dc..e89d7d9 100644 --- a/Source/gui/OptionsDlg/JobsPage.h +++ b/Source/gui/OptionsDlg/JobsPage.h @@ -23,6 +23,7 @@ class CJobsPage : public CPropertyPage enum { IDD = IDD_PAGE_JOBS }; CButton m_PollJobs; CButton m_JobCountRadio; + CButton m_JobsEnabledCheckbox; int m_JobCount; //}}AFX_DATA @@ -44,12 +45,11 @@ class CJobsPage : public CPropertyPage void OnFetchRadio(); void OnJobConfigure(); + void OnEnableCheckbox(); // Generated message map functions //{{AFX_MSG(CJobsPage) virtual BOOL OnInitDialog(); //}}AFX_MSG DECLARE_MESSAGE_MAP() - -private: }; diff --git a/Source/gui/P4Registry.cpp b/Source/gui/P4Registry.cpp index e13e370..06263a6 100644 --- a/Source/gui/P4Registry.cpp +++ b/Source/gui/P4Registry.cpp @@ -144,6 +144,7 @@ #define FetchAllChanges _T("FetchAllChanges") #define FetchJobCount _T("FetchJobCount") #define FetchAllJobs _T("FetchAllJobs") +#define JobsEnabled _T("JobsEnabled") #define FetchHistCount _T("FetchHistCount") #define FetchAllHist _T("FetchAllHist") #define FetchCompleteHist _T("FetchCompleteHist") @@ -695,6 +696,9 @@ BOOL CP4Registry::ReadRegistry() if(!GetRegKey( &m_FetchAllJobs, _T("Options"), FetchAllJobs, FALSE )) SetFetchAllJobs( m_FetchAllJobs ); + if(!GetRegKey( &m_JobsEnabled, _T("Options"), JobsEnabled, TRUE )) + SetJobsEnabled( m_JobsEnabled ); + if(!GetRegKey( &m_FetchHistCount, _T("Options"), FetchHistCount, 100 )) SetFetchHistCount( m_FetchHistCount ); @@ -2854,6 +2858,14 @@ BOOL CP4Registry::SetFetchAllJobs(BOOL fetchAll) return SetRegKey( str, _T("Options"), FetchAllJobs ); } +BOOL CP4Registry::SetJobsEnabled(BOOL jobsEnabled) +{ + CString str; + str.Format(_T("%ld"), (long) jobsEnabled); + m_JobsEnabled=jobsEnabled; + return SetRegKey( str, _T("Options"), JobsEnabled ); +} + BOOL CP4Registry::SetFetchHistCount(long fetchHistCount) { ASSERT( fetchHistCount >= 0); diff --git a/Source/gui/P4Registry.h b/Source/gui/P4Registry.h index c8d797f..84f4220 100644 --- a/Source/gui/P4Registry.h +++ b/Source/gui/P4Registry.h @@ -187,6 +187,7 @@ class CP4Registry BOOL m_FetchAll; long m_FetchJobCount; BOOL m_FetchAllJobs; + BOOL m_JobsEnabled; long m_FetchHistCount; BOOL m_FetchAllHist; long m_FetchCompleteHist; @@ -527,6 +528,7 @@ class CP4Registry inline BOOL GetFetchAllChanges() { ASSERT(m_AttemptedRead); return m_FetchAll; } inline int GetFetchJobCount() { ASSERT(m_AttemptedRead); return m_FetchJobCount; } inline BOOL GetFetchAllJobs() { ASSERT(m_AttemptedRead); return m_FetchAllJobs; } + inline BOOL GetJobsEnabled() { ASSERT(m_AttemptedRead); return m_JobsEnabled; } inline int GetFetchHistCount() { ASSERT(m_AttemptedRead); return m_FetchHistCount; } inline BOOL GetFetchAllHist() { ASSERT(m_AttemptedRead); return m_FetchAllHist; } inline long GetFetchCompleteHist() { ASSERT(m_AttemptedRead); return m_FetchCompleteHist; } @@ -631,6 +633,7 @@ class CP4Registry BOOL SetFetchAllChanges(BOOL fetchAll); BOOL SetFetchJobCount(long fetchJobCount); BOOL SetFetchAllJobs(BOOL fetchAllJobs); + BOOL SetJobsEnabled(BOOL jobsEnabled); BOOL SetFetchHistCount(long fetchHistCount); BOOL SetFetchAllHist(BOOL fetchAll); BOOL SetFetchCompleteHist(long fetchComplete); diff --git a/Source/gui/P4Win409/P4Win409.rc b/Source/gui/P4Win409/P4Win409.rc index 7ed0e43..ea5918d 100644 --- a/Source/gui/P4Win409/P4Win409.rc +++ b/Source/gui/P4Win409/P4Win409.rc @@ -1,5 +1,7 @@ // Microsoft Visual C++ generated resource script. // +#pragma code_page(65001) + #include "..\resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -13,13 +15,10 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -68,29 +67,40 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDR_MAINFRAME ICON "..\\res\\P4win.ico" + IDI_ICONSM ICON "..\\res\\P4winSM.ico" + ///////////////////////////////////////////////////////////////////////////// // // Bitmap // IDB_LOGO BITMAP "..\\res\\p4win.bmp" + IDB_LOGO256 BITMAP "..\\res\\p4win256.bmp" + IDB_UPDOWNARROWS BITMAP "..\\res\\UpDownArrows.bmp" + IDB_TOOLBAR4 BITMAP "..\\res\\ToolBar4.bmp" + IDB_TOOLBAR32 BITMAP "..\\res\\ToolBar32.bmp" + IDB_BITMAPDIS BITMAP "..\\res\\ToolBarDis.bmp" + IDB_VIEWICONS4 BITMAP "..\\res\\ViewIcons4.bmp" + IDB_VIEWICONS32 BITMAP "..\\res\\ViewIcons32.bmp" + IDB_GETADOBE BITMAP "..\\res\\GetAdobeReader.bmp" + ///////////////////////////////////////////////////////////////////////////// // // Toolbar // -IDR_MAINFRAME TOOLBAR 18, 16 +IDR_MAINFRAME TOOLBAR 18, 16 BEGIN BUTTON ID_VIEW_UPDATE SEPARATOR @@ -125,7 +135,7 @@ BEGIN BUTTON ID_PERFORCE_INFO END -IDR_HISTORY TOOLBAR 16, 15 +IDR_HISTORY TOOLBAR 16, 15 BEGIN BUTTON ID_FILEREVISION_DIFF2 BUTTON ID_FILEREVISION_BROWSE @@ -137,7 +147,7 @@ END // Menu // -IDR_MAINFRAME MENU +IDR_MAINFRAME MENU BEGIN POPUP "&File" BEGIN @@ -145,10 +155,8 @@ BEGIN POPUP "S&ync" BEGIN MENUITEM "&Sync to Head Revision\tCtrl+Y", ID_FILE_GET - MENUITEM "Sync to Head Revision (&Preview Only)", - ID_FILE_GETWHATIF - MENUITEM "Sync to Revision, &Label, Changelist Number or Date...", - ID_FILE_GETCUSTOM + MENUITEM "Sync to Head Revision (&Preview Only)", ID_FILE_GETWHATIF + MENUITEM "Sync to Revision, &Label, Changelist Number or Date...", ID_FILE_GETCUSTOM MENUITEM "&Redo sync", ID_FILE_REFRESH MENUITEM "&Force sync to Head Revision", ID_FILE_FORCESYNCTOHEAD END @@ -169,8 +177,7 @@ BEGIN MENUITEM "A&nnotations using Rev#s...", ID_FILE_ANNOTATE MENUITEM "&All Annotations using Rev#s...", ID_FILE_ANNOTATEALL MENUITEM "Annotations using &Chg#s...", ID_FILE_ANNOTATECHG - MENUITEM "All Annotations using Ch&g#s...", - ID_FILE_ANNOTATECHGALL + MENUITEM "All Annotations using Ch&g#s...", ID_FILE_ANNOTATECHGALL END MENUITEM SEPARATOR MENUITEM "&Diff Client File vs Depot File\tCtrl+D", ID_FILE_DIFFHEAD @@ -192,11 +199,8 @@ BEGIN MENUITEM "Run &Merge Tool...\tCtrl+M", ID_FILE_RUNMERGETOOL MENUITEM "&Schedule File for Resolve", ID_FILE_SCHEDULE MENUITEM SEPARATOR - MENUITEM "&Properties for Their file...", - ID_THEIRFILE_PROPERTIES - MENUITEM "Revision &History for Their file...", - ID_THEIRFILE_REVISIONHISTORY - + MENUITEM "&Properties for Their file...", ID_THEIRFILE_PROPERTIES + MENUITEM "Revision &History for Their file...", ID_THEIRFILE_REVISIONHISTORY MENUITEM "&Find Their file in Depot", ID_THEIRFILE_FINDINDEPOT END MENUITEM "Rename...", ID_FILE_RENAME @@ -208,8 +212,7 @@ BEGIN MENUITEM "Add Files to User &Reviews...", ID_ADD_REVIEWS MENUITEM SEPARATOR MENUITEM "Change File T&ype...", ID_FILETYPE - MENUITEM "&Move Files to another Changelist...", - ID_FILE_MV2OTHERCHGLIST + MENUITEM "&Move Files to another Changelist...", ID_FILE_MV2OTHERCHGLIST MENUITEM SEPARATOR MENUITEM "Check Consistenc&y", ID_DIFFSDSE MENUITEM SEPARATOR @@ -226,24 +229,18 @@ BEGIN BEGIN MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY MENUITEM SEPARATOR - MENUITEM "Find File/Folder matching Path in Cli&pboard\tCtrl+V", - ID_EDIT_PASTE - MENUITEM "&Find File matching Pattern...\tCtrl+F", - ID_POSITIONTOPATTERN + MENUITEM "Find File/Folder matching Path in Cli&pboard\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Find File matching Pattern...\tCtrl+F", ID_POSITIONTOPATTERN MENUITEM "Find &Next\tF3", ID_FINDNEXT MENUITEM "Find P&revious\tShift+F3", ID_FINDPREV - MENUITEM "Find File &Under Selected Folder...\tShift+Ctrl+F", - ID_FINDFILEUNDERFOLDER + MENUITEM "Find File &Under Selected Folder...\tShift+Ctrl+F", ID_FINDFILEUNDERFOLDER MENUITEM "Find &Selected File in Depot", ID_POSITIONDEPOT - MENUITEM "Find Selected File in Chan&gelist\tAlt+F3", - ID_POSITIONCHGS + MENUITEM "Find Selected File in Chan&gelist\tAlt+F3", ID_POSITIONCHGS MENUITEM SEPARATOR POPUP "Selec&t Files..." BEGIN - MENUITEM "that &Differ from Depot\tCtrl+Q", - ID_SELECTFILES_CHANGED - MENUITEM "that Do&n't Differ from Depot\tShift+Ctrl+Q", - ID_SELECTFILES_UNCHANGED + MENUITEM "that &Differ from Depot\tCtrl+Q", ID_SELECTFILES_CHANGED + MENUITEM "that Do&n't Differ from Depot\tShift+Ctrl+Q", ID_SELECTFILES_UNCHANGED END MENUITEM "Select &All\tCtrl+A", ID_EDIT_SELECT_ALL END @@ -337,8 +334,7 @@ BEGIN MENUITEM "Sort Files by File &Name", ID_SORTCHGFILESBYNAME MENUITEM "Sort Files by E&xtension", ID_SORTCHGFILESBYEXT MENUITEM "Sort Files by &Action", ID_SORTCHGFILESBYACTION - MENUITEM "Sort Files by &Resolve Status", - ID_SORTCHGFILESBYRESOLVE + MENUITEM "Sort Files by &Resolve Status", ID_SORTCHGFILESBYRESOLVE MENUITEM "Sort Changelists by &User", ID_SORTCHGSBYUSER END MENUITEM SEPARATOR @@ -372,18 +368,13 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&List Files at Label", ID_LABEL_LISTFILES MENUITEM "&Add/Replace Files Listed in Label...", ID_LABEL_SYNC - MENUITEM "Delete S&ome Files Listed in Label...", - ID_LABEL_DELETEFILES - MENUITEM "S&ync Specific Files in Label to Client...", - ID_LABEL_SYNC_CLIENT - MENUITEM "Add Depo&t Selections to Label View...", - ID_LABEL_ADDTOLABELVIEW + MENUITEM "Delete S&ome Files Listed in Label...", ID_LABEL_DELETEFILES + MENUITEM "S&ync Specific Files in Label to Client...", ID_LABEL_SYNC_CLIENT + MENUITEM "Add Depo&t Selections to Label View...", ID_LABEL_ADDTOLABELVIEW MENUITEM "Diff Files in &2 Labels...", ID_LABEL_DIFF2 MENUITEM SEPARATOR - MENUITEM "Set Labels &Filter for Selected Files", - ID_LABELFILTER_SETVIEW - MENUITEM "Set Labels F&ilter for Selected Files and Revisions", - ID_LABELFILTER_SETVIEWREV + MENUITEM "Set Labels &Filter for Selected Files", ID_LABELFILTER_SETVIEW + MENUITEM "Set Labels F&ilter for Selected Files and Revisions", ID_LABELFILTER_SETVIEWREV MENUITEM "Clea&r Labels Filter", ID_LABELFILTER_CLEARVIEW MENUITEM "Filter Labels by O&wner...", ID_FILTERBYOWNER MENUITEM "Clear Owner Filter", ID_CLEAROWNERFILTER @@ -391,18 +382,11 @@ BEGIN POPUP "Default drag and dro&p action" BEGIN MENUITEM "&Add/Replace Files Listed in Label", ID_LABELDD_SYNC - MENUITEM "Delete S&ome Files Listed in Label", - ID_LABELDD_DELETEFILES - MENUITEM "Syn&c Specific Files in Label to Client", - ID_LABELDD_SYNC_CLIENT - MENUITEM "Add Depo&t Selections to Label View", - ID_LABELDD_ADDTOLABELVIEW - - MENUITEM "Set Labels &Filter for Selected Files", - ID_LABELFILTERDD_SETVIEW - MENUITEM "Set Labels Filter for Selected Files and &Revisions", - ID_LABELFILTERDD_SETVIEWREV - + MENUITEM "Delete S&ome Files Listed in Label", ID_LABELDD_DELETEFILES + MENUITEM "Syn&c Specific Files in Label to Client", ID_LABELDD_SYNC_CLIENT + MENUITEM "Add Depo&t Selections to Label View", ID_LABELDD_ADDTOLABELVIEW + MENUITEM "Set Labels &Filter for Selected Files", ID_LABELFILTERDD_SETVIEW + MENUITEM "Set Labels Filter for Selected Files and &Revisions", ID_LABELFILTERDD_SETVIEWREV MENUITEM "&Show Drag and Drop Menu", ID_LABELDD_SHOWMENU END MENUITEM "&View Labels\tF9", ID_LABEL_ACTIVATE @@ -416,8 +400,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "S&witch to Client", ID_CLIENTSPEC_SWITCH MENUITEM "Set Defa&ult Client ", ID_SETDEFCLIENT - MENUITEM "Create or Replace Client From &Template...", - ID_CLIENT_TEMPLATE + MENUITEM "Create or Replace Client From &Template...", ID_CLIENT_TEMPLATE MENUITEM SEPARATOR MENUITEM "&Filter Clients...", ID_FILTERCLIENTS MENUITEM "Clear Client Filter", ID_CLEARCLIENTFILTER @@ -484,9 +467,7 @@ BEGIN BEGIN MENUITEM "&Show Connection Info", ID_PERFORCE_INFO MENUITEM "&Help Topics...\tF1", ID_HELP_FINDER - MENUITEM "&Getting Started with P4Win...", - ID_HELP_GETTINGSTARTEDWITHP4WIN - + MENUITEM "&Getting Started with P4Win...", ID_HELP_GETTINGSTARTEDWITHP4WIN MENUITEM SEPARATOR MENUITEM "&Perforce Web Site...", ID_WWW_PERFORCE_COM MENUITEM "&E-mail support@perforce.com...", ID_EMAIL_PERFORCE @@ -495,7 +476,7 @@ BEGIN END END -IDR_HISTORY MENU +IDR_HISTORY MENU BEGIN POPUP "File-&Revision" BEGIN @@ -505,7 +486,7 @@ BEGIN END END -IDR_DROPMENU MENU +IDR_DROPMENU MENU BEGIN POPUP "File&Drop" BEGIN @@ -515,7 +496,7 @@ BEGIN END END -IDR_FILTER MENU +IDR_FILTER MENU BEGIN POPUP "&Filter" BEGIN @@ -524,10 +505,9 @@ BEGIN END END -IDR_DUMMY MENU +IDR_DUMMY MENU BEGIN POPUP "This menu is NOT part of the program - it's just a way to define context menu ids" - BEGIN MENUITEM "Show &Timestamp", ID_SHOW_TIMESTAMP MENUITEM "Sync to Changelist...", ID_SYNC_CHANGE @@ -537,14 +517,12 @@ BEGIN MENUITEM "Annotate All", ID_FILE_ANNOTATEALL MENUITEM "Cancel Operation", ID_CANCEL_BUTTON MENUITEM "Diff &2 Files", ID_DIFF2 - MENUITEM "Use as Local Default Template", - ID_CLIENT_USEASLOCALTEMPLATE - MENUITEM "Clear Local Default Template", - ID_CLIENT_CLEARLOCALTEMPLATE + MENUITEM "Use as Local Default Template", ID_CLIENT_USEASLOCALTEMPLATE + MENUITEM "Clear Local Default Template", ID_CLIENT_CLEARLOCALTEMPLATE END END -IDR_SPECDESC MENU +IDR_SPECDESC MENU BEGIN POPUP "&File" BEGIN @@ -606,7 +584,7 @@ BEGIN END END -IDR_SPECDESC_RICH MENU +IDR_SPECDESC_RICH MENU BEGIN POPUP "This is the popup context menu for the rich edit control" BEGIN @@ -638,7 +616,7 @@ BEGIN END END -IDR_STATUS MENU +IDR_STATUS MENU BEGIN POPUP "This is the popup context menu for the status view" BEGIN @@ -656,7 +634,7 @@ BEGIN END END -IDR_USER MENU +IDR_USER MENU BEGIN POPUP "This is the popup context menu for the user view" BEGIN @@ -674,45 +652,33 @@ BEGIN END END -IDR_LABELDRAGDROP MENU +IDR_LABELDRAGDROP MENU BEGIN POPUP "Menu for drag drop of files to label pane" BEGIN MENUITEM "&Add/Replace Files Listed in Label...", ID_LABEL_SYNC - MENUITEM "Delete S&ome Files Listed in Label...", - ID_LABEL_DELETEFILES - MENUITEM "Syn&c Specific Files in Label to Client...", - ID_LABEL_SYNC_CLIENT - MENUITEM "Add Depo&t Selections to Label View...", - ID_LABEL_ADDTOLABELVIEW + MENUITEM "Delete S&ome Files Listed in Label...", ID_LABEL_DELETEFILES + MENUITEM "Syn&c Specific Files in Label to Client...", ID_LABEL_SYNC_CLIENT + MENUITEM "Add Depo&t Selections to Label View...", ID_LABEL_ADDTOLABELVIEW MENUITEM SEPARATOR - MENUITEM "Set Labels &Filter for Selected Files", - ID_LABELFILTER_SETVIEW - MENUITEM "Set Labels Filter for Selected Files and &Revisions", - ID_LABELFILTER_SETVIEWREV + MENUITEM "Set Labels &Filter for Selected Files", ID_LABELFILTER_SETVIEW + MENUITEM "Set Labels Filter for Selected Files and &Revisions", ID_LABELFILTER_SETVIEWREV MENUITEM SEPARATOR POPUP "&Default drag and drop action" BEGIN MENUITEM "&Add/Replace Files Listed in Label", ID_LABELDD_SYNC - MENUITEM "Delete S&ome Files Listed in Label", - ID_LABELDD_DELETEFILES - MENUITEM "Syn&c Specific Files in Label to Client", - ID_LABELDD_SYNC_CLIENT - MENUITEM "Add Depo&t Selections to Label View", - ID_LABELDD_ADDTOLABELVIEW - - MENUITEM "Set Labels &Filter for Selected Files", - ID_LABELFILTERDD_SETVIEW - MENUITEM "Set Labels Filter for Selected Files and &Revisions", - ID_LABELFILTERDD_SETVIEWREV - + MENUITEM "Delete S&ome Files Listed in Label", ID_LABELDD_DELETEFILES + MENUITEM "Syn&c Specific Files in Label to Client", ID_LABELDD_SYNC_CLIENT + MENUITEM "Add Depo&t Selections to Label View", ID_LABELDD_ADDTOLABELVIEW + MENUITEM "Set Labels &Filter for Selected Files", ID_LABELFILTERDD_SETVIEW + MENUITEM "Set Labels Filter for Selected Files and &Revisions", ID_LABELFILTERDD_SETVIEWREV MENUITEM "&Show this Drag and Drop Menu", ID_LABELDD_SHOWMENU END MENUITEM "&Cancel", ID_FILEDROP_CANCEL END END -IDR_SPECDESC_DIFF MENU +IDR_SPECDESC_DIFF MENU BEGIN POPUP "This is the popup menu for the Show DIff button" BEGIN @@ -727,18 +693,17 @@ BEGIN END END -IDR_FILTER_LABEL MENU +IDR_FILTER_LABEL MENU BEGIN POPUP "This is the popup menu for the labels view filter dropdown" BEGIN MENUITEM "&Filter for Selected Files", ID_LABELFILTER_SETVIEW - MENUITEM "Filter for Selected Files and &Revisions", - ID_LABELFILTER_SETVIEWREV + MENUITEM "Filter for Selected Files and &Revisions", ID_LABELFILTER_SETVIEWREV MENUITEM "Filter Labels by O&wner...", ID_FILTERBYOWNER END END -IDR_CLEARFILTER_LABEL MENU +IDR_CLEARFILTER_LABEL MENU BEGIN POPUP "This is the popup menu for the clear labels filter dropdown" BEGIN @@ -747,17 +712,16 @@ BEGIN END END -IDR_FILTER_OLDCHG MENU +IDR_FILTER_OLDCHG MENU BEGIN POPUP "This is the popup menu for the submitted changes view filter dropdown" - BEGIN MENUITEM "Clear Filter", ID_FILTER_CLEARVIEW MENUITEM "Set Filter...", ID_FILTER_SETVIEW END END -IDR_SETFILTER_JOB MENU +IDR_SETFILTER_JOB MENU BEGIN POPUP "This is the popup menu for the jobs view filter dropdown" BEGIN @@ -767,7 +731,7 @@ BEGIN END END -IDR_CLEARFILTER_JOB MENU +IDR_CLEARFILTER_JOB MENU BEGIN POPUP "This is the popup menu for the jobs view filter dropdown" BEGIN @@ -776,7 +740,7 @@ BEGIN END END -IDR_VIEW_DEPOT MENU +IDR_VIEW_DEPOT MENU BEGIN POPUP "This is the popup menu for the depot view view dropdown" BEGIN @@ -791,7 +755,7 @@ BEGIN END END -IDR_VIEW_DELTA MENU +IDR_VIEW_DELTA MENU BEGIN POPUP "This is the popup menu for the delta view view dropdown" BEGIN @@ -803,7 +767,7 @@ BEGIN END END -IDR_MERGE2DIFFYOURS MENU +IDR_MERGE2DIFFYOURS MENU BEGIN POPUP "Yours Diff menu for 2-way merge" BEGIN @@ -814,7 +778,7 @@ BEGIN END END -IDR_MERGE2DIFFTHEIRS MENU +IDR_MERGE2DIFFTHEIRS MENU BEGIN POPUP "Theirs Diff menu for 2-way merge" BEGIN @@ -825,7 +789,7 @@ BEGIN END END -IDR_MERGE3DIFFYOURS MENU +IDR_MERGE3DIFFYOURS MENU BEGIN POPUP "Yours Diff menu for 3-way merge" BEGIN @@ -838,7 +802,7 @@ BEGIN END END -IDR_MERGE3DIFFTHEIRS MENU +IDR_MERGE3DIFFTHEIRS MENU BEGIN POPUP "Theirs Diff menu for 3-way merge" BEGIN @@ -851,7 +815,7 @@ BEGIN END END -IDR_MERGE3DIFFMERGED MENU +IDR_MERGE3DIFFMERGED MENU BEGIN POPUP "Merged Diff menu for 3-way merge" BEGIN @@ -863,7 +827,7 @@ BEGIN END END -IDR_MERGE3DIFFALL MENU +IDR_MERGE3DIFFALL MENU BEGIN POPUP "Diff menu for 3-way merge" BEGIN @@ -883,7 +847,7 @@ BEGIN END END -IDR_EDITMENUALL MENU +IDR_EDITMENUALL MENU BEGIN POPUP "Edit menu for 3-way merge" BEGIN @@ -893,7 +857,7 @@ BEGIN END END -IDR_PROPMENUALL MENU +IDR_PROPMENUALL MENU BEGIN POPUP "Properties menu for 3-way merge" BEGIN @@ -902,7 +866,7 @@ BEGIN END END -IDR_HISTMENUALL MENU +IDR_HISTMENUALL MENU BEGIN POPUP "Rev Hist menu for 3-way merge" BEGIN @@ -917,7 +881,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS +IDR_MAINFRAME ACCELERATORS BEGIN "0", ID_BKMK_10, VIRTKEY, ALT, NOINVERT "0", ID_FAV_10, VIRTKEY, SHIFT, ALT, NOINVERT @@ -942,27 +906,23 @@ BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "B", ID_BOOKMARKS, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT - "C", ID_EDIT_COPYCLIENTPATH, VIRTKEY, SHIFT, CONTROL, - NOINVERT + "C", ID_EDIT_COPYCLIENTPATH, VIRTKEY, SHIFT, CONTROL, NOINVERT "D", ID_FILE_DIFFHEAD, VIRTKEY, CONTROL, NOINVERT "E", ID_FILE_OPENEDIT, VIRTKEY, CONTROL, NOINVERT "F", ID_POSITIONTOPATTERN, VIRTKEY, CONTROL, NOINVERT - "F", ID_FINDFILEUNDERFOLDER, VIRTKEY, SHIFT, CONTROL, - NOINVERT + "F", ID_FINDFILEUNDERFOLDER, VIRTKEY, SHIFT, CONTROL, NOINVERT "I", ID_FILE_ANNOTATIONS, VIRTKEY, CONTROL, NOINVERT "G", ID_FILE_REVISIONTREE, VIRTKEY, CONTROL, NOINVERT "H", ID_FILE_REVISIONHISTORY, VIRTKEY, CONTROL, NOINVERT "J", ID_JOB_SETFILTER, VIRTKEY, CONTROL, NOINVERT "L", ID_FILE_LOCK, VIRTKEY, CONTROL, NOINVERT "M", ID_FILE_RUNMERGETOOL, VIRTKEY, CONTROL, NOINVERT - "M", ID_FILE_AUTORESOLVE, VIRTKEY, SHIFT, CONTROL, - NOINVERT + "M", ID_FILE_AUTORESOLVE, VIRTKEY, SHIFT, CONTROL, NOINVERT "N", ID_NEW, VIRTKEY, CONTROL, NOINVERT "O", ID_NEW_WINDOW, VIRTKEY, CONTROL, NOINVERT "P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT "Q", ID_SELECTFILES_CHANGED, VIRTKEY, CONTROL, NOINVERT - "Q", ID_SELECTFILES_UNCHANGED, VIRTKEY, SHIFT, CONTROL, - NOINVERT + "Q", ID_SELECTFILES_UNCHANGED, VIRTKEY, SHIFT, CONTROL, NOINVERT "R", ID_FILE_REVERT, VIRTKEY, CONTROL, NOINVERT "S", ID_CHANGE_SUBMIT, VIRTKEY, CONTROL, NOINVERT "T", ID_PERFORCE_OPTIONS, VIRTKEY, CONTROL, NOINVERT @@ -1000,36 +960,26 @@ END // IDD_HISTORY DIALOGEX 0, 0, 354, 208 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File Revision History" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_REVISIONLIST,"SysListView32",LVS_REPORT | - LVS_SORTDESCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | - WS_THICKFRAME | WS_TABSTOP,7,36,341,65 + CONTROL "List1",IDC_REVISIONLIST,"SysListView32",LVS_REPORT | LVS_SORTDESCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_THICKFRAME | WS_TABSTOP,7,36,341,65 LTEXT "&Actions",IDC_ACTIONLABEL,7,104,160,8 - EDITTEXT IDC_REVISIONACTION,7,116,341,28,ES_MULTILINE | - ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + EDITTEXT IDC_REVISIONACTION,7,116,341,28,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL LTEXT "Description of Chan&ge",IDC_SUMMARYLABEL,7,146,160,8 - EDITTEXT IDC_REVISIONINFO,7,156,341,28,ES_MULTILINE | - ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + EDITTEXT IDC_REVISIONINFO,7,156,341,28,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "&View",IDB_BROWSE,6,4,40,14 PUSHBUTTON "&Sync",IDB_GET,50,4,40,14 PUSHBUTTON "&Diff Revs",IDB_DIFFREVISIONS,94,4,40,14 PUSHBUTTON "Diff vs &ClientFile",IDB_DIFFVSCLIENT,138,4,75,14 PUSHBUTTON "Descri&be Changelist",ID_CHANGE_DESCRIBE,217,4,75,14 PUSHBUTTON "Rec&over",ID_FILE_RECOVER,296,4,40,14 - CONTROL "Display b&ranching history",IDC_COMPLETEHIST,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,189,114,14 - LTEXT "B&rancing history:",IDC_STATIC_1,7,192,54,8,NOT - WS_VISIBLE | WS_DISABLED - CONTROL "Off",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED | WS_GROUP,65,192,26,10 - CONTROL "Inherited",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,95,192,44,10 - CONTROL "Content",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,144,192,40,10 + CONTROL "Display b&ranching history",IDC_COMPLETEHIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,189,114,14 + LTEXT "B&rancing history:",IDC_STATIC_1,7,192,54,8,NOT WS_VISIBLE | WS_DISABLED + CONTROL "Off",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP,65,192,26,10 + CONTROL "Inherited",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,95,192,44,10 + CONTROL "Content",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,144,192,40,10 PUSHBUTTON "&More",IDC_MORE,189,189,50,14 DEFPUSHBUTTON "Close",IDOK,244,189,50,14 PUSHBUTTON "Help",IDHELP,298,189,50,14 @@ -1037,20 +987,15 @@ BEGIN END IDD_SPECSHEET DIALOGEX 0, 0, 300, 167 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Perforce Specification Editor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "&Reopen Files",IDC_REOPEN,"Button",BS_AUTOCHECKBOX | - BS_LEFT | WS_TABSTOP,7,137,67,9 + CONTROL "&Reopen Files",IDC_REOPEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,7,137,67,9 LTEXT "Unchanged:",IDC_STATICUNCHANGED,74,137,42,8 - CONTROL "Sub&mit",IDC_RADIOSUBMIT,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,119,136,39,10 - CONTROL "Re&vert",IDC_RADIOREVERT,"Button",BS_AUTORADIOBUTTON, - 162,136,37,10 - CONTROL "&Leave",IDC_RADIOLEAVE,"Button",BS_AUTORADIOBUTTON,205, - 136,35,10 + CONTROL "Sub&mit",IDC_RADIOSUBMIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,119,136,39,10 + CONTROL "Re&vert",IDC_RADIOREVERT,"Button",BS_AUTORADIOBUTTON,162,136,37,10 + CONTROL "&Leave",IDC_RADIOLEAVE,"Button",BS_AUTORADIOBUTTON,205,136,35,10 PUSHBUTTON "&Submit",ID_ACTION_1,243,131,52,14 PUSHBUTTON "&Update",ID_UPDATE,23,148,52,14 PUSHBUTTON "&Editor",ID_EDITOR,78,148,52,14 @@ -1060,40 +1005,26 @@ BEGIN END IDD_SPECDLG DIALOGEX 0, 0, 298, 137 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Perforce Specification Editor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN RTEXT "* required field",IDC_REQSTATIC,221,1,59,8 - COMBOBOX IDC_COMBO1,106,22,97,47,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO2,106,38,97,41,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO3,106,55,97,56,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO4,106,71,97,59,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO5,106,87,97,57,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Static1",IDC_STATIC1,7,7,93,9,NOT WS_VISIBLE | - WS_BORDER - LTEXT "Static2",IDC_STATIC2,7,19,93,9,NOT WS_VISIBLE | - WS_BORDER - CTEXT "8pt Courier New only!",IDC_BUSYMESSAGE,7,36,88,54, - SS_CENTERIMAGE | NOT WS_VISIBLE - LTEXT "Static3",IDC_STATIC3,7,121,273,9,NOT WS_VISIBLE | - WS_BORDER - PUSHBUTTON "Cancel",ID_FILE_CANCEL,230,15,50,14,NOT WS_VISIBLE | - WS_DISABLED - PUSHBUTTON "&Browse...",IDC_BROWSE,230,32,50,14,NOT WS_VISIBLE | - WS_DISABLED + COMBOBOX IDC_COMBO1,106,22,97,47,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO2,106,38,97,41,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO3,106,55,97,56,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO4,106,71,97,59,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO5,106,87,97,57,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "Static1",IDC_STATIC1,7,7,93,9,NOT WS_VISIBLE | WS_BORDER + LTEXT "Static2",IDC_STATIC2,7,19,93,9,NOT WS_VISIBLE | WS_BORDER + CTEXT "8pt Courier New only!",IDC_BUSYMESSAGE,7,36,88,54,SS_CENTERIMAGE | NOT WS_VISIBLE + LTEXT "Static3",IDC_STATIC3,7,121,273,9,NOT WS_VISIBLE | WS_BORDER + PUSHBUTTON "Cancel",ID_FILE_CANCEL,230,15,50,14,NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Browse...",IDC_BROWSE,230,32,50,14,NOT WS_VISIBLE | WS_DISABLED END IDD_ADDLIST DIALOGEX 0, 0, 290, 198 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | - WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Add Files to Source Control" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -1101,104 +1032,71 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,179,177,50,14 PUSHBUTTON "Help",IDHELP,233,177,50,14 GROUPBOX "Files",IDC_STATIC3,7,7,276,126 - LTEXT "Listbox rect",IDC_STATICRECT,12,18,265,93,NOT - WS_VISIBLE + LTEXT "Listbox rect",IDC_STATICRECT,12,18,265,93,NOT WS_VISIBLE PUSHBUTTON "&Filter Files...",IDC_FILTERFILES,120,114,50,14 - PUSHBUTTON "&Remove Selected Files",ID_DELETESELECTED,173,114,103, - 14,NOT WS_VISIBLE + PUSHBUTTON "&Remove Selected Files",ID_DELETESELECTED,173,114,103,14,NOT WS_VISIBLE LTEXT "Add to &change:",IDC_ADDPROMPT,7,141,57,10 - COMBOBOX IDC_ADDCHANGNUM,64,140,135,63,CBS_DROPDOWNLIST | - CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_ADDCHANGNUM,64,140,135,63,CBS_DROPDOWNLIST | CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Open files for:",IDC_STATIC1,7,156,54,8,NOT WS_VISIBLE - CONTROL "&Add only",IDC_ADD,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED | WS_GROUP,64,156,48,10 - CONTROL "&Edit only",IDC_EDIT,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,115,156,48,10 - CONTROL "&Both add and edit",IDC_BOTH,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,166, - 156,71,10 - CONTROL "&Delete",IDC_DELETE,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,242,156,41,10 - CONTROL "Default",IDC_DEFAULT1,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED | WS_GROUP,64,167,39,10 - CONTROL "Default",IDC_DEFAULT2,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,115,167,39,10 - CONTROL "Default",IDC_DEFAULT3,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,166,167,39,10 - CONTROL "Default",IDC_DEFAULT4,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED,242,167,39,10 + CONTROL "&Add only",IDC_ADD,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP,64,156,48,10 + CONTROL "&Edit only",IDC_EDIT,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,115,156,48,10 + CONTROL "&Both add and edit",IDC_BOTH,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,166,156,71,10 + CONTROL "&Delete",IDC_DELETE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,242,156,41,10 + CONTROL "Default",IDC_DEFAULT1,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP,64,167,39,10 + CONTROL "Default",IDC_DEFAULT2,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,115,167,39,10 + CONTROL "Default",IDC_DEFAULT3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,166,167,39,10 + CONTROL "Default",IDC_DEFAULT4,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED,242,167,39,10 END IDD_SPECDESC DIALOGEX 0, 0, 300, 220 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Perforce Spec Description" MENU IDR_SPECDESC FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "Close",IDOK,253,165,45,14 - CONTROL "",IDC_DESCRIPTION,"RichEdit20A",ES_MULTILINE | - ES_AUTOVSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | - WS_TABSTOP,1,12,297,147 + CONTROL "",IDC_DESCRIPTION,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,1,12,297,147 PUSHBUTTON "&Print",IDC_PRINT,1,165,45,14 - CONTROL "&+",IDC_PREVITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | - WS_TABSTOP,50,165,45,14 - CONTROL "&-",IDC_NEXTITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | - WS_TABSTOP,98,165,45,14 + CONTROL "&+",IDC_PREVITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_TABSTOP,50,165,45,14 + CONTROL "&-",IDC_NEXTITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_TABSTOP,98,165,45,14 PUSHBUTTON "Ed&it",IDC_EDITIT,146,165,45,14,NOT WS_VISIBLE - CONTROL "&Show Diffs",IDC_SHOWDIFFS,"Button",BS_OWNERDRAW | NOT - WS_VISIBLE | WS_DISABLED | WS_TABSTOP,195,165,60,14 - PUSHBUTTON "Show &Fixes",IDC_SHOWFIXES,197,165,45,14,NOT WS_VISIBLE | - WS_DISABLED - PUSHBUTTON "Show &Files",IDC_SHOWFILES,199,165,45,14,NOT WS_VISIBLE | - WS_DISABLED + CONTROL "&Show Diffs",IDC_SHOWDIFFS,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,195,165,60,14 + PUSHBUTTON "Show &Fixes",IDC_SHOWFIXES,197,165,45,14,NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "Show &Files",IDC_SHOWFILES,199,165,45,14,NOT WS_VISIBLE | WS_DISABLED END IDD_SPECDESCW DIALOGEX 0, 0, 300, 220 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Perforce Spec Description" MENU IDR_SPECDESC FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "Close",IDOK,253,165,45,14 - CONTROL "",IDC_DESCRIPTION,"RichEdit20W",WS_BORDER | WS_VSCROLL | - WS_TABSTOP | 0x844,1,12,297,147 + CONTROL "",IDC_DESCRIPTION,"RichEdit20W",WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x844,1,12,297,147 PUSHBUTTON "&Print",IDC_PRINT,1,165,45,14 - CONTROL "&+",IDC_PREVITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | - WS_TABSTOP,50,165,45,14 - CONTROL "&-",IDC_NEXTITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | - WS_TABSTOP,98,165,45,14 + CONTROL "&+",IDC_PREVITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_TABSTOP,50,165,45,14 + CONTROL "&-",IDC_NEXTITEM,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_TABSTOP,98,165,45,14 PUSHBUTTON "Ed&it",IDC_EDITIT,146,165,45,14,NOT WS_VISIBLE - CONTROL "&Show Diffs",IDC_SHOWDIFFS,"Button",BS_OWNERDRAW | NOT - WS_VISIBLE | WS_DISABLED | WS_TABSTOP,195,165,60,14 - PUSHBUTTON "Show &Fixes",IDC_SHOWFIXES,197,165,45,14,NOT WS_VISIBLE | - WS_DISABLED - PUSHBUTTON "Show &Files",IDC_SHOWFILES,199,165,45,14,NOT WS_VISIBLE | - WS_DISABLED + CONTROL "&Show Diffs",IDC_SHOWDIFFS,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,195,165,60,14 + PUSHBUTTON "Show &Fixes",IDC_SHOWFIXES,197,165,45,14,NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "Show &Files",IDC_SHOWFILES,199,165,45,14,NOT WS_VISIBLE | WS_DISABLED END IDD_VIEWERSELECT DIALOGEX 0, 0, 224, 131 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Editor/Viewer" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Use &associated application",IDC_RADIO1,"Button", - BS_AUTORADIOBUTTON,7,7,134,15 - CONTROL "Use &selected application",IDC_RADIO2,"Button", - BS_AUTORADIOBUTTON,7,20,135,15 - LISTBOX IDC_MRU_LIST,7,38,210,64,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "Use &associated application",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,7,7,134,15 + CONTROL "Use &selected application",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,7,20,135,15 + LISTBOX IDC_MRU_LIST,7,38,210,64,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,29,110,60,14 PUSHBUTTON "&Find Editor...",IDC_FINDVIEWER,93,110,60,14 PUSHBUTTON "Cancel",IDCANCEL,157,110,60,14 END IDD_MERGE3 DIALOGEX 0, 0, 281, 179 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Resolve File (3-way merge)" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1207,8 +1105,7 @@ BEGIN PUSHBUTTON "S&kip File",IDCANCEL,78,158,50,14 PUSHBUTTON "Skip Remaining Fi&les",IDC_CANCEL_ALL,132,158,86,14 PUSHBUTTON "Help",IDHELP,223,158,50,14 - CONTROL "&Diff...",IDC_BDIFF,"Button",BS_OWNERDRAW | WS_TABSTOP, - 15,129,50,14 + CONTROL "&Diff...",IDC_BDIFF,"Button",BS_OWNERDRAW | WS_TABSTOP,15,129,50,14 PUSHBUTTON "&Edit...",IDC_BEDIT,69,129,50,14 PUSHBUTTON "&Properties...",IDC_BPROPERTIES,123,129,60,14 PUSHBUTTON "Revision &History...",IDC_BHISTORY,186,129,80,14 @@ -1218,41 +1115,28 @@ BEGIN CTEXT "already been",IDC_RERESOLVE_WARN3,213,35,54,8 CTEXT "Resolved.",IDC_RERESOLVE_WARN4,213,44,54,8 GROUPBOX "Files",IDC_STATIC1,7,7,266,144 - LTEXT "Summary of initial differences - Count of diff chunks:", - IDC_STATIC,15,16,190,12 + LTEXT "Summary of initial differences - Count of diff chunks:",IDC_STATIC,15,16,190,12 LTEXT "Yours:",IDC_STATIC,20,30,32,12 - EDITTEXT IDC_YOURCHUNKS,53,31,38,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_YOURCHUNKS,53,31,38,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Theirs:",IDC_STATIC,20,44,34,12 - EDITTEXT IDC_THEIRCHUNKS,53,43,38,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_THEIRCHUNKS,53,43,38,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Both:",IDC_STATIC,93,30,42,12 - EDITTEXT IDC_BOTHCHUNKS,139,30,28,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_BOTHCHUNKS,139,30,28,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Conflicting:",IDC_STATIC,93,44,44,12 - EDITTEXT IDC_CONFLICTCHUNKS,139,43,28,12,ES_AUTOHSCROLL | - ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_CONFLICTCHUNKS,139,43,28,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER GROUPBOX "",IDC_STATIC_1,10,55,259,26 GROUPBOX "",IDC_STATIC_2,10,77,259,26 GROUPBOX "",IDC_STATIC_3,10,100,259,26 - EDITTEXT IDC_YOURFILE,50,63,216,15,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_TABSTOP - EDITTEXT IDC_THEIRFILE,50,86,216,15,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_TABSTOP - EDITTEXT IDC_CONFLICTSREMAINING,53,110,130,12,ES_CENTER | - ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT - WS_TABSTOP - CONTROL "&Yours:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,13,65,35,10 - CONTROL "&Theirs:",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,87,35,10 - CONTROL "&Merged:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,109,38,10 + EDITTEXT IDC_YOURFILE,50,63,216,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_THEIRFILE,50,86,216,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_CONFLICTSREMAINING,53,110,130,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + CONTROL "&Yours:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,65,35,10 + CONTROL "&Theirs:",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,87,35,10 + CONTROL "&Merged:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,109,38,10 END IDD_MERGE2 DIALOGEX 0, 0, 281, 120 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Resolve File (2-way merge)" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -1260,53 +1144,41 @@ BEGIN PUSHBUTTON "S&kip File",IDCANCEL,78,99,50,14 PUSHBUTTON "Skip Remaining Fi&les",IDC_CANCEL_ALL,132,99,86,14 PUSHBUTTON "Help",IDHELP,223,99,50,14 - CONTROL "&Diff...",IDC_BDIFF,"Button",BS_OWNERDRAW | WS_TABSTOP, - 15,70,50,14 + CONTROL "&Diff...",IDC_BDIFF,"Button",BS_OWNERDRAW | WS_TABSTOP,15,70,50,14 PUSHBUTTON "&Edit...",IDC_BEDIT,69,70,50,14 PUSHBUTTON "&Properties...",IDC_BPROPERTIES,123,70,60,14 PUSHBUTTON "Revision &History...",IDC_BHISTORY,186,70,80,14 GROUPBOX "Files",IDC_STATIC1,7,7,266,85 GROUPBOX "",IDC_STATIC_1,10,15,259,26 GROUPBOX "",IDC_STATIC_2,10,37,259,26 - EDITTEXT IDC_YOURFILE,50,23,216,15,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_TABSTOP - EDITTEXT IDC_THEIRFILE,50,46,216,15,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_TABSTOP - CONTROL "&Yours:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,13,25,35,10 - CONTROL "&Theirs:",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,47,35,10 + EDITTEXT IDC_YOURFILE,50,23,216,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + EDITTEXT IDC_THEIRFILE,50,46,216,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + CONTROL "&Yours:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,25,35,10 + CONTROL "&Theirs:",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,47,35,10 END IDD_CUSTOMGET DIALOGEX 0, 0, 325, 86 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sync Files to Revision, Changelist, Label, Date or Client" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "&Revision #:",IDC_ISREVNBR,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,7,9,50,10 - CONTROL "&Other:",IDC_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,7,28,32,10 + CONTROL "&Revision #:",IDC_ISREVNBR,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,9,50,10 + CONTROL "&Other:",IDC_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,28,32,10 EDITTEXT IDC_REVNBR,58,8,50,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_COMBO,41,27,68,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO,41,27,68,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_EDITLABEL,113,26,150,13,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "&Browse...",IDC_BROWSE,267,25,50,14,WS_DISABLED CONTROL "S&ync only files submitted in changelist",IDC_CHECKONLY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,52,209,10 - CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_DATELABEL,103, - 42,160,10 - CONTROL "&Force resynchronization",IDC_FORCE_RESYNC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,20,65,101,10 + CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_DATELABEL,103,42,160,10 + CONTROL "&Force resynchronization",IDC_FORCE_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,65,101,10 DEFPUSHBUTTON "&Sync Files",IDGET,123,65,68,14,WS_DISABLED PUSHBUTTON "Sync (&Preview)",IDGETPREVIEW,195,65,68,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,267,65,50,14 END IDD_FILE_INFORMATION DIALOGEX 0, 0, 266, 208 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Perforce File Information" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1315,46 +1187,35 @@ BEGIN LTEXT "&Client Path:",IDC_STATIC,9,23,52,15 EDITTEXT IDC_CLIENTPATH,71,23,188,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "File T&ype:",IDC_STATIC,9,46,57,15 - EDITTEXT IDC_HEADTYPE,71,46,55,12,ES_AUTOHSCROLL | ES_READONLY, - WS_EX_RIGHT + EDITTEXT IDC_HEADTYPE,71,46,55,12,ES_AUTOHSCROLL | ES_READONLY,WS_EX_RIGHT LTEXT "Si&ze on Server:",IDC_STATIC1,148,46,57,15 - EDITTEXT IDC_FILESIZE,214,46,45,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER,WS_EX_RIGHT + EDITTEXT IDC_FILESIZE,214,46,45,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER,WS_EX_RIGHT LTEXT "Head &Revision:",IDC_STATIC,9,63,57,15 - EDITTEXT IDC_HEADREV,71,63,55,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER,WS_EX_RIGHT + EDITTEXT IDC_HEADREV,71,63,55,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER,WS_EX_RIGHT LTEXT "Have Re&vision:",IDC_STATIC,148,63,61,15 - EDITTEXT IDC_HAVEREV,214,63,45,12,ES_AUTOHSCROLL | ES_READONLY | - ES_NUMBER,WS_EX_RIGHT + EDITTEXT IDC_HAVEREV,214,63,45,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER,WS_EX_RIGHT LTEXT "Head &Action:",IDC_STATIC,9,80,50,15 - EDITTEXT IDC_HEADACTION,71,80,55,12,ES_AUTOHSCROLL | ES_READONLY, - WS_EX_RIGHT + EDITTEXT IDC_HEADACTION,71,80,55,12,ES_AUTOHSCROLL | ES_READONLY,WS_EX_RIGHT LTEXT "H&ead Change:",IDC_STATIC,148,80,59,15 - EDITTEXT IDC_HEADCHANGE,214,80,45,12,ES_AUTOHSCROLL | ES_READONLY, - WS_EX_RIGHT + EDITTEXT IDC_HEADCHANGE,214,80,45,12,ES_AUTOHSCROLL | ES_READONLY,WS_EX_RIGHT LTEXT "Last Sub&mitted:",IDC_STATIC,9,98,55,15 EDITTEXT IDC_MODTIME,71,98,188,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "&Opened By:",IDC_STATIC,9,123,40,11 PUSHBUTTON "Descri&be",IDC_DESCRIBE,7,134,41,14,WS_DISABLED - LISTBOX IDC_OPENEDLIST,70,122,189,37,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | - WS_TABSTOP + LISTBOX IDC_OPENEDLIST,70,122,189,37,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP LTEXT "&Locked By:",IDC_STATIC,9,168,43,15 EDITTEXT IDC_LOCKEDBY,71,168,188,12,ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "Close",IDOK,209,187,50,14 END IDD_EDITASSOCIATION DIALOGEX 0, 0, 270, 108 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit Association" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Enter file &extension, using semicolons to separate multiple extensions (e.g. "".cpp"" or "".h;.c;.cpp""):", - IDC_STATIC,7,7,201,21 + LTEXT "Enter file &extension, using semicolons to separate multiple extensions (e.g. "".cpp"" or "".h;.c;.cpp""):",IDC_STATIC,7,7,201,21 EDITTEXT IDC_EXTENSION,7,29,256,15,ES_AUTOHSCROLL - LTEXT "&Application for Editing/Viewing this file type:", - IDC_STATIC,7,50,201,11 + LTEXT "&Application for Editing/Viewing this file type:",IDC_STATIC,7,50,201,11 EDITTEXT IDC_APPLICATION,7,63,200,15,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,213,64,50,14 DEFPUSHBUTTON "OK",IDOK,157,87,50,14 @@ -1362,118 +1223,94 @@ BEGIN END IDD_REVERTLIST DIALOGEX 0, 0, 289, 181 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Unchanged Files for Revert" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN PUSHBUTTON "Revert &Files",IDOK,222,160,60,14 PUSHBUTTON "Cancel",IDCANCEL,157,160,60,14 - PUSHBUTTON "&Remove Selected Items",ID_DELETESELECTED,60,160,92,14, - NOT WS_VISIBLE + PUSHBUTTON "&Remove Selected Items",ID_DELETESELECTED,60,160,92,14,NOT WS_VISIBLE LTEXT "Listbox rect",IDC_STATICRECT,7,7,275,138,NOT WS_VISIBLE END IDD_JOBLIST DIALOGEX 0, 0, 277, 182 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Select Job(s) Fixed by Changelist" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "List1",IDC_JOBLIST,"SysListView32",LVS_REPORT | - LVS_SORTDESCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | - WS_BORDER | WS_TABSTOP,7,23,263,65 + CONTROL "List1",IDC_JOBLIST,"SysListView32",LVS_REPORT | LVS_SORTDESCENDING | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,23,263,65 RTEXT "Set Job &Status to:",IDC_JOBSTATUSPROMPT,100,93,69,11 - COMBOBOX IDC_JOBSTATUS,172,91,98,120,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_JOBSTATUS,172,91,98,120,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "Job &Description:",IDC_SUMMARYLABEL,7,94,63,11 - EDITTEXT IDC_JOBDESC,7,106,263,42,ES_MULTILINE | ES_AUTOVSCROLL | - ES_READONLY | WS_VSCROLL + EDITTEXT IDC_JOBDESC,7,106,263,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "OK",IDOK,112,161,50,14 PUSHBUTTON "Cancel",IDCANCEL,166,161,50,14 PUSHBUTTON "Help",IDHELP,220,161,50,14 - EDITTEXT IDC_FILTER_TEXT,7,8,205,10,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_BORDER + EDITTEXT IDC_FILTER_TEXT,7,8,205,10,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER PUSHBUTTON "&Filter...",IDC_FILTER,165,7,50,12 PUSHBUTTON "&Clear...",ID_CLEARFILTER,220,7,50,12 END IDD_LISTBROWSE DIALOGEX 0, 0, 292, 183 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Select Object" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "List1",IDC_P4LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | - WS_BORDER | WS_TABSTOP,4,5,284,154 + CONTROL "List1",IDC_P4LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,5,284,154 PUSHBUTTON "&Refresh",IDC_REFRESH,4,164,50,14 - PUSHBUTTON "< &Back",IDC_BACK,74,164,50,14,NOT WS_VISIBLE | - WS_DISABLED + PUSHBUTTON "< &Back",IDC_BACK,74,164,50,14,NOT WS_VISIBLE | WS_DISABLED PUSHBUTTON "OK",IDOK,124,164,50,14 PUSHBUTTON "Cancel",IDCANCEL,181,164,50,14 PUSHBUTTON "&Describe...",IDC_DESCRIBE,238,164,50,14 END IDD_CONTEXT DIALOGEX 0, 0, 234, 75 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Set Diff Context" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Enter the number of lines of unchanged text that you would like displayed above and below each difference.", - IDC_STATIC1,7,7,220,25 + LTEXT "Enter the number of lines of unchanged text that you would like displayed above and below each difference.",IDC_STATIC1,7,7,220,25 CTEXT "&Context lines to show:",IDC_STATIC,0,32,85,8 - CONTROL "&All",IDC_CONTEXT_ALL,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,92,32,24,10 - CONTROL "&Limit number of lines to",IDC_CONTEXT_LIMITED,"Button", - BS_AUTORADIOBUTTON,117,32,88,10 - EDITTEXT IDC_CONTEXT,205,30,22,14,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + CONTROL "&All",IDC_CONTEXT_ALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,92,32,24,10 + CONTROL "&Limit number of lines to",IDC_CONTEXT_LIMITED,"Button",BS_AUTORADIOBUTTON,117,32,88,10 + EDITTEXT IDC_CONTEXT,205,30,22,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER DEFPUSHBUTTON "OK",IDOK,123,54,50,14 PUSHBUTTON "Cancel",IDCANCEL,177,54,50,14 END IDD_CREATENEWCLIENT DIALOGEX 0, 0, 129, 57 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Create New " FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT IDC_NAME,51,6,71,14,ES_AUTOHSCROLL - CONTROL "Run Client &Wizard",IDC_WIZARD,"Button",BS_AUTOCHECKBOX | - NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,22,115,10 + CONTROL "Run Client &Wizard",IDC_WIZARD,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,22,115,10 DEFPUSHBUTTON "OK",IDOK,19,36,50,14 PUSHBUTTON "Cancel",IDCANCEL,72,36,50,14 LTEXT "changethis",IDC_STATICNAME,7,9,42,8 END IDD_PASSWORD DIALOGEX 0, 0, 186, 70 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "P4Win: Enter Password" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This user requires a password",IDC_STATICMSG,7,7,171,8 LTEXT "&Password:",IDC_STATIC,7,24,35,10 EDITTEXT IDC_PASSWORD,44,22,135,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember this password?",IDC_CHECK1,"Button", - BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,36,110,10 - CTEXT "Caps Lock is ON",IDC_CAPSLOCK_MSG,7,36,171,8,NOT - WS_VISIBLE + CONTROL "&Remember this password?",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,36,110,10 + CTEXT "Caps Lock is ON",IDC_CAPSLOCK_MSG,7,36,171,8,NOT WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,69,49,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,49,50,14 END IDD_JOB_FILTER DIALOGEX 0, 0, 240, 85 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Job Filter" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Filtering &String",IDC_GROUPBOX,2,3,236,53 - COMBOBOX IDC_JOB_FILTER,8,17,224,160,CBS_DROPDOWN | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_JOB_FILTER,8,17,224,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Spec &Notes",ID_FORMINFO,73,35,50,14 PUSHBUTTON "&JobView",ID_JOBVIEW,127,35,50,14 PUSHBUTTON "&Delete",ID_RMVJOBFILTER,181,35,50,14 @@ -1483,23 +1320,20 @@ BEGIN END IDD_TEMPLATENAME DIALOGEX 0, 0, 188, 63 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Create Client from Template" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,77,42,50,14 PUSHBUTTON "Cancel",IDCANCEL,131,42,50,14 LTEXT "&Name of template:",IDC_STATIC,7,9,68,12 - EDITTEXT IDC_TEMPLATENAME,77,7,104,14,ES_AUTOHSCROLL | - ES_READONLY + EDITTEXT IDC_TEMPLATENAME,77,7,104,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "&Target name:",IDC_TARGETNAME,7,26,67,12 EDITTEXT IDC_SPECNAME_NEW,77,25,104,14,ES_AUTOHSCROLL END IDD_SETPWD DIALOGEX 0, 0, 157, 101 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Set or Change Password" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -1509,40 +1343,28 @@ BEGIN EDITTEXT IDC_PWDNEW,103,28,46,12,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "&Confirm new password:",IDC_STATIC,7,48,94,10 EDITTEXT IDC_PWDNEW2,103,46,46,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember password",IDC_REMBRPSW,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,46,64,104,10 + CONTROL "&Remember password",IDC_REMBRPSW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,64,104,10 DEFPUSHBUTTON "OK",IDOK,46,80,50,14 PUSHBUTTON "Cancel",IDCANCEL,100,80,50,14 END IDD_PAGE_INTEGFILESPECS DIALOGEX 0, 0, 287, 203 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File Integrate - Edit Filespecs" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Reverse Integration",IDC_REVERSEINTEG,"Button", - BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,200,3,83, - 10 + CONTROL "&Reverse Integration",IDC_REVERSEINTEG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,200,3,83,10 LTEXT "Branch &View",IDC_LABELBRANCH,4,3,95,8,NOT WS_VISIBLE - EDITTEXT IDC_BRANCHSPECS,120,130,75,14,ES_MULTILINE | ES_READONLY | - NOT WS_VISIBLE | WS_VSCROLL | WS_HSCROLL + EDITTEXT IDC_BRANCHSPECS,120,130,75,14,ES_MULTILINE | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL | WS_HSCROLL LTEXT "&Source Filespec",IDC_LABELSOURCE,4,4,93,8 - EDITTEXT IDC_SOURCESPECS,4,17,279,110,ES_MULTILINE | - ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL + EDITTEXT IDC_SOURCESPECS,4,17,279,110,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "Tar&get Filespec",IDC_LABELTARGET,4,130,114,8 - EDITTEXT IDC_TARGETSPECS,4,140,279,14,ES_AUTOHSCROLL | - ES_WANTRETURN - EDITTEXT IDC_TARGETSPECS_ALT,206,130,75,14,ES_MULTILINE | - ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL - CONTROL "&To",IDC_TARGETRADIO,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE,100,4,22,10 - CONTROL "&From Selected Files",IDC_SOURCERADIO,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,122,4,77,10 - LTEXT "Open file(s) under &Changelist:",IDC_STATIC_1,4,157,97, - 8,0,WS_EX_RIGHT - COMBOBOX IDC_CHANGECOMBO,4,168,166,72,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_TARGETSPECS,4,140,279,14,ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_TARGETSPECS_ALT,206,130,75,14,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL + CONTROL "&To",IDC_TARGETRADIO,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,100,4,22,10 + CONTROL "&From Selected Files",IDC_SOURCERADIO,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,122,4,77,10 + LTEXT "Open file(s) under &Changelist:",IDC_STATIC_1,4,157,97,8,0,WS_EX_RIGHT + COMBOBOX IDC_CHANGECOMBO,4,168,166,72,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Options...",IDC_ADVOPTS,177,166,50,14 PUSHBUTTON "&Preview",IDC_PREVIEW,233,166,50,14 PUSHBUTTON "< &Back",IDC_BACK,70,185,50,14 @@ -1552,157 +1374,107 @@ BEGIN END IDD_PAGE_INTEGOPTIONS DIALOGEX 0, 0, 249, 176 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Integrate target at &head rev",IDC_SYNCFIRST,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,7,117,13 - CONTROL "Force direct integration on&ly",IDC_FORCEDIRECT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,131,7,114,10 - CONTROL "&Force re-integration on all revisions even if some already integrated", - IDC_FORCEINTEG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 18,245,13 - CONTROL "Do ¬ copy new files to workspace",IDC_NOCOPY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,29,153,13 - CONTROL "&Permit deletes/re-adds",IDC_DELREADD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,40,93,13 - CONTROL "Deletes only",IDC_RADIO_DEL,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,98,42,54,10 - CONTROL "Re-adds only",IDC_RADIO_READD,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,156,42,57,10 - CONTROL "B&oth",IDC_RADIO_BOTH,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,217,42,30,10 - CONTROL "Enable &baseless merges",IDC_BASELESS,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,51,110,13 - CONTROL "Propagate file &types",IDC_PROPAGATETYPES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,62,109,13 - CONTROL "&Reverse branch mapping",IDC_REVERSE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,131,62,111,13 - CONTROL "Ignor&e files that were deleted and re-added", - IDC_BASEVIADELREADD,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,73,229,13 - CONTROL "&Delete source file(s), for rename operation", - IDC_DELETESOURCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 84,152,13 - CONTROL "&All files",IDC_ALLFILES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,43,95,39,10 - CONTROL "&Subset of files",IDC_FILESUBSET,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,84,95,74,10 - EDITTEXT IDC_FILESPECS,0,108,249,68,ES_MULTILINE | ES_WANTRETURN | - WS_DISABLED | WS_VSCROLL | WS_HSCROLL + CONTROL "Integrate target at &head rev",IDC_SYNCFIRST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,117,13 + CONTROL "Force direct integration on&ly",IDC_FORCEDIRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,7,114,10 + CONTROL "&Force re-integration on all revisions even if some already integrated",IDC_FORCEINTEG, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,18,245,13 + CONTROL "Do ¬ copy new files to workspace",IDC_NOCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,29,153,13 + CONTROL "&Permit deletes/re-adds",IDC_DELREADD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,40,93,13 + CONTROL "Deletes only",IDC_RADIO_DEL,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,98,42,54,10 + CONTROL "Re-adds only",IDC_RADIO_READD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,156,42,57,10 + CONTROL "B&oth",IDC_RADIO_BOTH,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,217,42,30,10 + CONTROL "Enable &baseless merges",IDC_BASELESS,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,51,110,13 + CONTROL "Propagate file &types",IDC_PROPAGATETYPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,62,109,13 + CONTROL "&Reverse branch mapping",IDC_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,62,111,13 + CONTROL "Ignor&e files that were deleted and re-added",IDC_BASEVIADELREADD, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,73,229,13 + CONTROL "&Delete source file(s), for rename operation",IDC_DELETESOURCE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,84,152,13 + CONTROL "&All files",IDC_ALLFILES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,43,95,39,10 + CONTROL "&Subset of files",IDC_FILESUBSET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,84,95,74,10 + EDITTEXT IDC_FILESPECS,0,108,249,68,ES_MULTILINE | ES_WANTRETURN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL LTEXT "Integrate to:",IDC_INTEGTOLABEL,4,95,37,10 - GROUPBOX "Default setting for ""Open files under"" option in integration dialog", - IDC_USEGRPCHGLIST,4,86,241,34 - CONTROL "Defa&ult changelist",IDC_USEDEFCHGLIST,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,11,96,171,10 - CONTROL "Ne&w changelist",IDC_USENEWCHGLIST,"Button", - BS_AUTORADIOBUTTON,11,107,169,10 - GROUPBOX "Default setting for ""Open files under"" option in rename dialog", - IDC_USEGRPCHGLIST2,4,122,241,34 - CONTROL "Default changelist",IDC_USEDEFCHGLIST2,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,11,132,171,10 - CONTROL "New changelist",IDC_USENEWCHGLIST2,"Button", - BS_AUTORADIOBUTTON,11,143,169,10 + GROUPBOX "Default setting for ""Open files under"" option in integration dialog",IDC_USEGRPCHGLIST,4,86,241,34 + CONTROL "Defa&ult changelist",IDC_USEDEFCHGLIST,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,96,171,10 + CONTROL "Ne&w changelist",IDC_USENEWCHGLIST,"Button",BS_AUTORADIOBUTTON,11,107,169,10 + GROUPBOX "Default setting for ""Open files under"" option in rename dialog",IDC_USEGRPCHGLIST2,4,122,241,34 + CONTROL "Default changelist",IDC_USEDEFCHGLIST2,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,132,171,10 + CONTROL "New changelist",IDC_USENEWCHGLIST2,"Button",BS_AUTORADIOBUTTON,11,143,169,10 END IDD_PAGE_INTEGREVRNG DIALOGEX 0, 0, 249, 176 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | - WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU CAPTION "Source Revision Range" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Starting with",IDC_STATIC,4,7,241,78 - CONTROL "&First unintegrated revision",IDC_F_IS1STREV,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,21,123,10 - CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button", - BS_AUTORADIOBUTTON,9,41,50,10 - CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,9, - 61,32,10 + CONTROL "&First unintegrated revision",IDC_F_IS1STREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,21,123,10 + CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button",BS_AUTORADIOBUTTON,9,41,50,10 + CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,9,61,32,10 EDITTEXT IDC_F_REVNBR,60,39,43,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_F_COMBO,43,60,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_F_COMBO,43,60,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_F_SYMBOL,106,60,82,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "&Browse...",IDC_F_BROWSE,191,59,50,14 - RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,17,73, - 171,9 + RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,17,73,171,9 GROUPBOX "Ending with",IDC_STATIC,4,91,241,78 - CONTROL "&Last unintegrated revision",IDC_T_ISHEADREV,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,105,122,10 - CONTROL "Revisio&n #:",IDC_T_ISREVNBR,"Button", - BS_AUTORADIOBUTTON,9,125,50,10 - CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,9, - 145,32,10 + CONTROL "&Last unintegrated revision",IDC_T_ISHEADREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,105,122,10 + CONTROL "Revisio&n #:",IDC_T_ISREVNBR,"Button",BS_AUTORADIOBUTTON,9,125,50,10 + CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,9,145,32,10 EDITTEXT IDC_T_REVNBR,60,123,43,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_T_COMBO,43,144,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_T_COMBO,43,144,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_T_SYMBOL,106,144,82,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Bro&wse...",IDC_T_BROWSE,191,143,50,14 - RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,18, - 158,170,9 + RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,18,158,170,9 END IDD_CLIENTWIZBEGIN DIALOGEX 0, 0, 286, 140 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | - WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU CAPTION "Client Workspace Wizard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "&Select an existing client workspace",IDC_RADIO1,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,61,237,10 - CONTROL "&Create a new client workspace",IDC_RADIO2,"Button", - BS_AUTORADIOBUTTON,14,75,229,10 + CONTROL "&Select an existing client workspace",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,61,237,10 + CONTROL "&Create a new client workspace",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,14,75,229,10 PUSHBUTTON "&View",IDC_VIEW_GETSTART,52,116,56,24 - LTEXT "Need Help? See the ""Getting Started with P4Win"" manual.", - IDC_STATIC,2,93,160,20 - LTEXT "Requires Adobe® Acrobat Reader® - click to download", - IDC_STATIC,173,93,108,20 + LTEXT "Need Help? See the ""Getting Started with P4Win"" manual.",IDC_STATIC,2,93,160,20 + LTEXT "Requires Adobe® Acrobat Reader® - click to download",IDC_STATIC,173,93,108,20 PUSHBUTTON "Get &Adobe",IDC_GETADOBE,178,116,56,24,BS_BITMAP - EDITTEXT IDC_EDIT1,0,0,286,46,ES_MULTILINE | ES_AUTOHSCROLL | - ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Choose one of the following options and click the Next button:", - IDC_STATIC,2,47,268,8 + EDITTEXT IDC_EDIT1,0,0,286,46,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Choose one of the following options and click the Next button:",IDC_STATIC,2,47,268,8 END IDD_CLIENTWIZCREATE DIALOGEX 0, 0, 287, 168 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | - WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU CAPTION "Client Workspace Wizard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "To create a new client workspace, enter the following information:", - IDC_STATIC,0,0,259,8 + LTEXT "To create a new client workspace, enter the following information:",IDC_STATIC,0,0,259,8 LTEXT "Client workspace &name:",IDC_STATIC,0,24,104,8 EDITTEXT IDC_EDITNAME,105,21,117,14,ES_AUTOHSCROLL LTEXT "Client workspace &root folder:",IDC_STATIC,0,48,105,8 EDITTEXT IDC_EDITROOT,105,46,117,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,237,45,50,14 GROUPBOX "Template",IDC_STATIC,15,70,256,59 - CONTROL "N&one",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,21,81,74,10 - CONTROL "&Use",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,21,97,28, - 10 - CONTROL "&Local default template",IDC_RADIO3,"Button", - BS_AUTORADIOBUTTON,21,113,189,10 + CONTROL "N&one",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,21,81,74,10 + CONTROL "&Use",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,21,97,28,10 + CONTROL "&Local default template",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,21,113,189,10 EDITTEXT IDC_TEMPLATE,53,96,158,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Bro&wse...",IDC_BROWSE2,215,96,50,14,WS_DISABLED - CONTROL "&Edit client...",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,21,135,157,10 + CONTROL "&Edit client...",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,135,157,10 END IDD_NEW_WINDOW DIALOGEX 0, 0, 279, 139 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Switch Port Client User" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Recent:",IDC_STATIC,7,7,24,8 - COMBOBOX IDC_PORTCLIENTUSER,42,7,186,160,CBS_DROPDOWN | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PORTCLIENTUSER,42,7,186,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Port:",IDC_STATIC,7,30,24,8 - COMBOBOX IDC_PORT,42,29,168,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PORT,42,29,168,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "&Client:",IDC_STATIC,7,55,22,8 EDITTEXT IDC_CLIENT,42,52,117,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE_CLIENTS,162,52,50,14 @@ -1714,78 +1486,52 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,152,118,58,14 PUSHBUTTON "Help",IDHELP,214,118,58,14 PUSHBUTTON "Dele&te",IDC_REMOVE,232,7,40,13 - CONTROL "Set t&o default",IDC_SETDEFPORT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,215,31,57,9 - CONTROL "Set to d&efault",IDC_SETDEFCLIENT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,215,55,57,9 - CONTROL "Set to de&fault",IDC_SETDEFUSER,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,215,79,57,9 + CONTROL "Set t&o default",IDC_SETDEFPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,31,57,9 + CONTROL "Set to d&efault",IDC_SETDEFCLIENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,55,57,9 + CONTROL "Set to de&fault",IDC_SETDEFUSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,79,57,9 GROUPBOX "Open P4Win",IDC_STATIC,7,92,204,23 - CONTROL "with &last used Port, Client and User", - IDC_STARTWITHMRUPCU,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,12,101,129,10 - CONTROL "using &Defaults",IDC_STARTWITHDEFAULTS,"Button", - BS_AUTORADIOBUTTON,142,101,62,10 + CONTROL "with &last used Port, Client and User",IDC_STARTWITHMRUPCU, + "Button",BS_AUTORADIOBUTTON | WS_GROUP,12,101,129,10 + CONTROL "using &Defaults",IDC_STARTWITHDEFAULTS,"Button",BS_AUTORADIOBUTTON,142,101,62,10 PUSHBUTTON "Set &all to default",IDC_SETDEFALL,214,97,58,14 END IDD_FILETYPE DIALOGEX 0, 0, 307, 208 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Change File Type" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Action",IDC_STATIC,7,7,293,22 - CONTROL "Chan&ge file type",IDC_CHANGE,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,12,15,105,10 - CONTROL "Add f&ile type modifiers",IDC_ADD,"Button", - BS_AUTORADIOBUTTON,128,15,121,10 + CONTROL "Chan&ge file type",IDC_CHANGE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,15,105,10 + CONTROL "Add f&ile type modifiers",IDC_ADD,"Button",BS_AUTORADIOBUTTON,128,15,121,10 GROUPBOX "Base File Type",ID_STATIC1,7,30,293,22 - CONTROL "&Text",IDC_TEXT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | - WS_TABSTOP,12,39,29,10 - CONTROL "&Binary",IDC_BINARY,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,45,39,35,10 - CONTROL "S&ymlink",IDC_SYMLINK,"Button",BS_AUTORADIOBUTTON,84,39, - 40,10 - CONTROL "&Resource",IDC_RESOURCE,"Button",BS_AUTORADIOBUTTON,128, - 39,48,10 - CONTROL "&Apple",IDC_APPLE,"Button",BS_AUTORADIOBUTTON,177,39,34, - 10 - CONTROL "&Unicode",IDC_UNICODE,"Button",BS_AUTORADIOBUTTON,214, - 39,44,10 - CONTROL "Utf1&6",IDC_UTF16,"Button",BS_AUTORADIOBUTTON,260,39,38, - 10 + CONTROL "&Text",IDC_TEXT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,39,29,10 + CONTROL "&Binary",IDC_BINARY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,45,39,35,10 + CONTROL "S&ymlink",IDC_SYMLINK,"Button",BS_AUTORADIOBUTTON,84,39,40,10 + CONTROL "&Resource",IDC_RESOURCE,"Button",BS_AUTORADIOBUTTON,128,39,48,10 + CONTROL "&Apple",IDC_APPLE,"Button",BS_AUTORADIOBUTTON,177,39,34,10 + CONTROL "&Unicode",IDC_UNICODE,"Button",BS_AUTORADIOBUTTON,214,39,44,10 + CONTROL "Utf1&6",IDC_UTF16,"Button",BS_AUTORADIOBUTTON,260,39,38,10 GROUPBOX "File Type Modifiers",IDC_STATIC,7,54,293,60 - CONTROL "+&x exec bit set on client",IDC_FILETYPE_X,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,63,178,10 - CONTROL "+&w always writeable on client",IDC_FILETYPE_W,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,73,163,10 - CONTROL "+&k $keyword:$ expansion",IDC_FILETYPE_K,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,83,102,10 - CONTROL "+&o only $Id:$ && $Header:$",IDC_FILETYPE_O,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,116,83,100,10 + CONTROL "+&x exec bit set on client",IDC_FILETYPE_X,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,63,178,10 + CONTROL "+&w always writeable on client",IDC_FILETYPE_W,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,73,163,10 + CONTROL "+&k $keyword:$ expansion",IDC_FILETYPE_K,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,83,102,10 + CONTROL "+&o only $Id:$ && $Header:$",IDC_FILETYPE_O,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,83,100,10 CONTROL "+&m preserve file modification times",IDC_FILETYPE_M, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,162,10 - CONTROL "+&l disallow multiple opens of this file", - IDC_FILETYPE_L,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12, - 103,162,10 + CONTROL "+&l disallow multiple opens of this file",IDC_FILETYPE_L, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,103,162,10 GROUPBOX "Server Storage Method",IDC_STATIC,7,116,293,67 CONTROL " s&erver stores using default method",IDC_FILETYPE_DEF, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12, - 125,163,10 - CONTROL "+&C server stores compressed file per revision (binary default)", - IDC_FILETYPE_C,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 12,135,240,10 - CONTROL "+&D server stores deltas in RCS format (text default)", - IDC_FILETYPE_D,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 12,145,239,10 - CONTROL "+&F server stores full file per revision (opposite of +C)", - IDC_FILETYPE_F,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 12,155,241,10 - CONTROL "+&S server stores only ",IDC_FILETYPE_S,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,167,91,10 - COMBOBOX IDC_COMBO1,105,166,34,30,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,125,163,10 + CONTROL "+&C server stores compressed file per revision (binary default)",IDC_FILETYPE_C, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,135,240,10 + CONTROL "+&D server stores deltas in RCS format (text default)",IDC_FILETYPE_D, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,145,239,10 + CONTROL "+&F server stores full file per revision (opposite of +C)",IDC_FILETYPE_F, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,155,241,10 + CONTROL "+&S server stores only ",IDC_FILETYPE_S,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,167,91,10 + COMBOBOX IDC_COMBO1,105,166,34,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "revision(s)",IDC_STATIC,144,168,79,8 DEFPUSHBUTTON "OK",IDOK,142,187,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,196,187,50,14 @@ -1793,8 +1539,7 @@ BEGIN END IDD_CHANGE_DESCRIBE DIALOGEX 0, 0, 137, 55 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Describe Changelist" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -1805,8 +1550,7 @@ BEGIN END IDD_JOB_DESCRIBE DIALOGEX 0, 0, 147, 64 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Describe Job" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -1819,25 +1563,19 @@ BEGIN END IDD_CHANGE_SYNC DIALOGEX 0, 0, 287, 63 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sync to Selected Changelist" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Sync &all client files to selected changelist", - IDC_SYNC_ALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP | - WS_TABSTOP,7,7,201,10 - CONTROL "Sync files in selected changelist &only", - IDC_SYNC_CHGONLY,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,7,18,201,10 - CONTROL "Sync files in selected changelist to &previous revision", - IDC_SYNC_CHGPREV,"Button",BS_AUTORADIOBUTTON,7,29,213,10 - CONTROL "Default",IDC_DEFAULT1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,230,7,50,10 - CONTROL "Default",IDC_DEFAULT2,"Button",BS_AUTORADIOBUTTON,230, - 18,50,10 - CONTROL "Default",IDC_DEFAULT3,"Button",BS_AUTORADIOBUTTON,230, - 29,50,10 + CONTROL "Sync &all client files to selected changelist",IDC_SYNC_ALL, + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,201,10 + CONTROL "Sync files in selected changelist &only",IDC_SYNC_CHGONLY, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,18,201,10 + CONTROL "Sync files in selected changelist to &previous revision",IDC_SYNC_CHGPREV, + "Button",BS_AUTORADIOBUTTON,7,29,213,10 + CONTROL "Default",IDC_DEFAULT1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,230,7,50,10 + CONTROL "Default",IDC_DEFAULT2,"Button",BS_AUTORADIOBUTTON,230,18,50,10 + CONTROL "Default",IDC_DEFAULT3,"Button",BS_AUTORADIOBUTTON,230,29,50,10 DEFPUSHBUTTON "&Sync",IDOK,68,42,50,14 PUSHBUTTON "&Preview",ID_PREVIEW,122,42,50,14 PUSHBUTTON "Cancel",IDCANCEL,176,42,50,14 @@ -1845,21 +1583,15 @@ BEGIN END IDD_P4FILES DIALOGEX 0, 0, 279, 202 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Find File Matching the given Pattern in the Depot Pane" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Enter file specification pattern - wild cards are acceptable - and click OK:", - IDC_STATIC,7,7,265,8 - COMBOBOX IDC_EDIT1,7,19,265,145,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - LTEXT "or &Select an item from the list below and click OK:", - IDC_STATIC,7,39,265,8 - LISTBOX IDC_LIST1,7,54,265,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - CONTROL "Close &after find",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,168,104,10 + LTEXT "&Enter file specification pattern - wild cards are acceptable - and click OK:",IDC_STATIC,7,7,265,8 + COMBOBOX IDC_EDIT1,7,19,265,145,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + LTEXT "or &Select an item from the list below and click OK:",IDC_STATIC,7,39,265,8 + LISTBOX IDC_LIST1,7,54,265,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "Close &after find",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,168,104,10 DEFPUSHBUTTON "OK",IDOK,7,181,50,14 PUSHBUTTON "&Filter Depot",IDD_DEPOT_FILTER,61,181,50,14 PUSHBUTTON "&Copy",IDC_COPY,115,181,50,14 @@ -1868,35 +1600,30 @@ BEGIN END IDD_TABSIZE DIALOGEX 0, 0, 118, 45 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Character per Tab Stop" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN RTEXT "&Tab size:",IDC_STATIC,9,9,48,8 - EDITTEXT IDC_TAB_SIZE,61,7,23,14,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + EDITTEXT IDC_TAB_SIZE,61,7,23,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER DEFPUSHBUTTON "OK",IDOK,7,24,50,14 PUSHBUTTON "Cancel",IDCANCEL,61,24,50,14 END IDD_ADDFILTER DIALOGEX 0, 0, 180, 155 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Filter Files to be Added by Extension" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "E&xtension:",IDC_STATIC,7,7,50,8 EDITTEXT IDC_EDIT1,7,18,50,14,ES_AUTOHSCROLL DEFPUSHBUTTON "&Add",IDC_ADD2FILTER,65,18,50,14 - LISTBOX IDC_EXTLIST,123,18,50,68,LBS_SORT | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_EXTLIST,123,18,50,68,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Delete",IDC_DELETE,65,36,50,14,WS_DISABLED PUSHBUTTON "Delete All",IDC_DELETEALL,65,56,50,14,WS_DISABLED GROUPBOX "Filter behavior",IDC_STATIC,7,89,166,38 CONTROL "&Include only files with these extensions",IDC_RADIO1, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14, - 99,144,10 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,99,144,10 CONTROL "&Exclude all files with these extensions",IDC_RADIO2, "Button",BS_AUTORADIOBUTTON,14,112,144,10 PUSHBUTTON "&Filter",IDOK,17,134,50,14,WS_DISABLED @@ -1905,28 +1632,22 @@ BEGIN END IDD_CUSTOMIZETOOLS DIALOGEX 0, 0, 290, 217 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Customize Tools Menu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Too&ls menu",IDC_STATIC_1,7,7,276,185 - LISTBOX IDC_MENULIST,12,17,265,55,WS_VSCROLL | WS_HSCROLL | - WS_TABSTOP + LISTBOX IDC_MENULIST,12,17,265,55,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add...",IDC_ADD,12,71,50,14 PUSHBUTTON "&Edit...",IDC_CHANGE,65,71,50,14 PUSHBUTTON "&Remove",IDC_REMOVE,119,71,50,14 PUSHBUTTON "Move &Up",IDC_MOVE_UP,173,71,50,14 PUSHBUTTON "Move &Down",IDC_MOVE_DOWN,226,71,50,14 LTEXT "&Name:",IDC_STATIC_2,17,20,27,8,NOT WS_VISIBLE - EDITTEXT IDC_EDIT_NAME,68,18,209,14,ES_AUTOHSCROLL | NOT - WS_VISIBLE | WS_DISABLED + EDITTEXT IDC_EDIT_NAME,68,18,209,14,ES_AUTOHSCROLL | NOT WS_VISIBLE | WS_DISABLED GROUPBOX "Item is a",IDC_STATIC_3,12,35,265,43,NOT WS_VISIBLE - CONTROL "&Tool",IDC_RADIO_TOOL,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE | WS_DISABLED | WS_GROUP | WS_TABSTOP,20,47, - 45,10 - CONTROL "&Submenu",IDC_RADIO_SUBMENU,"Button",BS_AUTORADIOBUTTON | - NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,20,61,91,10 + CONTROL "&Tool",IDC_RADIO_TOOL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_GROUP | WS_TABSTOP,20,47,45,10 + CONTROL "&Submenu",IDC_RADIO_SUBMENU,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,20,61,91,10 LTEXT "&Command:",IDC_STATIC,12,89,55,8 EDITTEXT IDC_COMMAND,68,88,154,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,226,87,50,14 @@ -1937,18 +1658,13 @@ BEGIN PUSHBUTTON "Browse...",IDC_BROWSE_DIR,226,120,50,14 CONTROL "Add to conte&xt menus if enabled",IDC_ADD2CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,126,10 - CONTROL "C&onsole application",IDC_CONSOLE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,146,92,10 + CONTROL "C&onsole application",IDC_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,146,92,10 CONTROL "&Write output to status pane",IDC_OUTPUT2STATUSPANE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,157,124,10 - CONTROL "Close &window upon exit",IDC_CLOSEWINDOW,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,168,98,10 - CONTROL "Refresh P&4Win upon exit",IDC_REFRESH,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,12,179,118,10 - CONTROL "&Prompt for arguments",IDC_PROMPT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,139,135,114,10 - CONTROL "Add Browse to prompt dialo&g",IDC_SHOWBROWSE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,139,146,122,10 + CONTROL "Close &window upon exit",IDC_CLOSEWINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,98,10 + CONTROL "Refresh P&4Win upon exit",IDC_REFRESH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,179,118,10 + CONTROL "&Prompt for arguments",IDC_PROMPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,135,114,10 + CONTROL "Add Browse to prompt dialo&g",IDC_SHOWBROWSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,146,122,10 LTEXT "Description&:",IDC_PROMPT_LABEL,139,163,114,8 EDITTEXT IDC_PROMPT_EDIT,139,173,138,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,125,196,50,14 @@ -1957,89 +1673,67 @@ BEGIN END IDD_CUSTOMIZEADD DIALOGEX 0, 0, 236, 55 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Tools Menu Item" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Name:",IDC_LABEL_TEXT,7,9,26,8 EDITTEXT IDC_EDIT,35,7,194,14,ES_AUTOHSCROLL LTEXT "Menu item is a",IDC_STATIC_TITLE,38,22,57,8 - CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,100,22,56,10 - CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,159,22,45,10 + CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,100,22,56,10 + CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,159,22,45,10 DEFPUSHBUTTON "OK",IDOK,125,34,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,179,34,50,14 END IDD_CUSTOMIZEARGS DIALOGEX 0, 0, 236, 48 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Arguments for Tool" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Arguments:",IDC_STATIC,7,9,44,8 - COMBOBOX IDC_EDIT,52,7,177,300,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_EDIT,52,7,177,300,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,73,27,50,14 PUSHBUTTON "&Browse...",IDC_BROWSE,126,27,50,14 PUSHBUTTON "Cancel",IDCANCEL,179,27,50,14 END IDD_FORCESYNC DIALOGEX 0, 0, 299, 182 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "List of files that are inconsistent with the depot" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LISTBOX IDC_LIST,7,7,285,122,LBS_SORT | LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_LIST,7,7,285,122,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP GROUPBOX "Action for all files",IDC_STATIC1,7,131,177,37 - CONTROL "&Open for Edit/Delete in chg#",IDC_OPEN,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,10,138,112,14 - CONTROL "&Force resynchronization",IDC_FORCERESYNC,"Button", - BS_AUTORADIOBUTTON,10,154,95,10 - COMBOBOX IDC_EDITCHANGNUM,123,138,58,63,CBS_DROPDOWNLIST | - CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | - WS_TABSTOP + CONTROL "&Open for Edit/Delete in chg#",IDC_OPEN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,138,112,14 + CONTROL "&Force resynchronization",IDC_FORCERESYNC,"Button",BS_AUTORADIOBUTTON,10,154,95,10 + COMBOBOX IDC_EDITCHANGNUM,123,138,58,63,CBS_DROPDOWNLIST | CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "OK",IDOK,127,152,50,14 - PUSHBUTTON "&Remove Selected Files",IDC_DELETESELECTED,189,136,103, - 14 + PUSHBUTTON "&Remove Selected Files",IDC_DELETESELECTED,189,136,103,14 PUSHBUTTON "Cancel",IDCANCEL,189,154,50,14 PUSHBUTTON "Help",IDHELP,242,154,50,14 - CTEXT "Note that no check has been made for files that have been added to the depot", - IDC_STATIC2,7,171,285,8 + CTEXT "Note that no check has been made for files that have been added to the depot",IDC_STATIC2,7,171,285,8 END IDD_AUTORESOLVE DIALOGEX 0, 0, 255, 158 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Auto Resolve" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "A&uto-resolve",IDC_STATIC,7,7,241,25 - CONTROL "S&elected Files",IDC_SELECTEDFILES,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,17,110,10 + CONTROL "S&elected Files",IDC_SELECTEDFILES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,17,110,10 CONTROL "&All open files requiring resolution",IDC_ALLFILES, "Button",BS_AUTORADIOBUTTON,124,17,119,10 - CONTROL "&Re-resolve previously resolved but unsubmitted files", - IDC_RERESOLVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14, - 35,187,10 + CONTROL "&Re-resolve previously resolved but unsubmitted files",IDC_RERESOLVE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,35,187,10 GROUPBOX "Resol&ve type",IDC_STATIC,7,47,241,72 - CONTROL "Accept &theirs",IDC_ACCEPTTHEIRS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,105,95,10 - CONTROL "Accept &yours",IDC_ACCEPTYOURS,"Button", - BS_AUTORADIOBUTTON,14,93,95,10 - CONTROL "&Safe automatic resolve",IDC_SAFERESOLVE,"Button", - BS_AUTORADIOBUTTON,14,69,100,10 - CONTROL "Auto&matic resolve",IDC_AUTORESOLVE,"Button", - BS_AUTORADIOBUTTON,14,57,100,10 - CONTROL "Automatic resolve, including con&flict markers", - IDC_AUTOWITHMARKERS,"Button",BS_AUTORADIOBUTTON,14,81, - 173,10 - PUSHBUTTON "Set &Default Auto Resolve Type",IDC_DEFAUTORSLV,116,57, - 125,14 + CONTROL "Accept &theirs",IDC_ACCEPTTHEIRS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,105,95,10 + CONTROL "Accept &yours",IDC_ACCEPTYOURS,"Button",BS_AUTORADIOBUTTON,14,93,95,10 + CONTROL "&Safe automatic resolve",IDC_SAFERESOLVE,"Button",BS_AUTORADIOBUTTON,14,69,100,10 + CONTROL "Auto&matic resolve",IDC_AUTORESOLVE,"Button",BS_AUTORADIOBUTTON,14,57,100,10 + CONTROL "Automatic resolve, including con&flict markers",IDC_AUTOWITHMARKERS, + "Button",BS_AUTORADIOBUTTON,14,81,173,10 + PUSHBUTTON "Set &Default Auto Resolve Type",IDC_DEFAUTORSLV,116,57,125,14 CONTROL "Attempt te&xtual merge of binary files",IDC_TEXTMERGE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,123,187,10 DEFPUSHBUTTON "OK",IDOK,38,137,50,14 @@ -2049,67 +1743,55 @@ BEGIN END IDD_RERESOLVING DIALOGEX 0, 0, 290, 180 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "P4Win Warning" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "The following files have already been resolved:", - IDC_STATIC,7,6,276,8 - LISTBOX IDC_LIST,7,19,276,123,LBS_SORT | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + CTEXT "The following files have already been resolved:",IDC_STATIC,7,6,276,8 + LISTBOX IDC_LIST,7,19,276,123,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP CTEXT "Do you want to re-resolve them?",IDC_STATIC,7,147,276,8 DEFPUSHBUTTON "Re-resolve",IDOK,179,159,50,14 PUSHBUTTON "Cancel",IDCANCEL,233,159,50,14 END IDD_MSGBOX DIALOGEX 0, 0, 250, 87 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Error" FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN PUSHBUTTON "OK",IDC_BUTTON1,27,66,60,14 PUSHBUTTON "Help",IDC_BUTTON2,95,66,60,14 PUSHBUTTON "Cancel",IDC_BUTTON3,163,66,60,14 - EDITTEXT IDC_MESSAGE,34,7,209,44,ES_MULTILINE | ES_AUTOVSCROLL | - ES_READONLY | ES_WANTRETURN | NOT WS_BORDER + EDITTEXT IDC_MESSAGE,34,7,209,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER ICON IDR_MAINFRAME,IDC_MSGICON,7,15,20,20 - CONTROL "Don't show this message again.", - IDC_CHECK_DONT_SHOW_AGAIN,"Button",BS_AUTOCHECKBOX | NOT - WS_VISIBLE | WS_DISABLED | WS_TABSTOP,27,53,195,10 + CONTROL "Don't show this message again.",IDC_CHECK_DONT_SHOW_AGAIN, + "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,27,53,195,10 END IDD_RESOLVE_FLAGS DIALOGEX 0, 0, 208, 61 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Resolve Options" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Perform a &textual merge (3-way merge) of binary files", - IDC_RESOLVE_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,7,194,10 - CONTROL "&Force re-resolve of already resolved files", - IDC_RE_RESOLVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, - 21,194,10 + CONTROL "Perform a &textual merge (3-way merge) of binary files",IDC_RESOLVE_BINARY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,194,10 + CONTROL "&Force re-resolve of already resolved files",IDC_RE_RESOLVE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,194,10 DEFPUSHBUTTON "OK",IDOK,97,40,50,14 PUSHBUTTON "Cancel",IDCANCEL,151,40,50,14 END IDD_DEPOT_FILTER DIALOGEX 0, 0, 266, 172 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Filter Depot View" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "In the Depot pane, show",IDC_STATIC,7,7,252,138 - CONTROL "&All opened files",IDC_ALL_OPENED,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,17,137,10 - CONTROL "&My opened files",IDC_MY_OPENED,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,11,27,147,10 - CONTROL "All &files matching these file patterns:", - IDC_DEPOT_LIST,"Button",BS_AUTORADIOBUTTON,11,37,201,10 - EDITTEXT IDC_FILELIST,13,49,240,90,ES_MULTILINE | ES_WANTRETURN | - WS_DISABLED | WS_VSCROLL | WS_HSCROLL | WS_GROUP + CONTROL "&All opened files",IDC_ALL_OPENED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,17,137,10 + CONTROL "&My opened files",IDC_MY_OPENED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,27,147,10 + CONTROL "All &files matching these file patterns:",IDC_DEPOT_LIST, + "Button",BS_AUTORADIOBUTTON,11,37,201,10 + EDITTEXT IDC_FILELIST,13,49,240,90,ES_MULTILINE | ES_WANTRETURN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL | WS_GROUP DEFPUSHBUTTON "OK",IDOK,47,151,50,14,WS_GROUP PUSHBUTTON "&Clear Filter",ID_CLEARFILTER,101,151,50,14 PUSHBUTTON "Help",IDHELP,155,151,50,14 @@ -2117,23 +1799,18 @@ BEGIN END IDD_JOB_CONFIGURE DIALOGEX 0, 0, 340, 201 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Set Job List Columns" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "These &columns may be added:",IDC_STATIC,7,7,135,8 - LISTBOX IDC_LIST_OTHER,7,20,135,149,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_LIST_OTHER,7,20,135,149,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add ->",IDC_ADD,145,20,50,14 LTEXT "Sho&w these columns:",IDC_STATIC,198,7,133,8 - LISTBOX IDC_LIST_SHOW,198,20,135,149,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_LIST_SHOW,198,20,135,149,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Remove <-",IDC_REMOVE,145,38,50,14 - PUSHBUTTON "Move &Up",IDC_UP,145,56,50,14,BS_CENTER | BS_VCENTER | - BS_MULTILINE - PUSHBUTTON "Move &Down",IDC_DOWN,145,74,50,14,BS_CENTER | - BS_VCENTER | BS_MULTILINE + PUSHBUTTON "Move &Up",IDC_UP,145,56,50,14,BS_CENTER | BS_VCENTER | BS_MULTILINE + PUSHBUTTON "Move &Down",IDC_DOWN,145,74,50,14,BS_CENTER | BS_VCENTER | BS_MULTILINE DEFPUSHBUTTON "OK",IDOK,66,180,50,14 PUSHBUTTON "Cancel",IDCANCEL,120,180,50,14 PUSHBUTTON "&Set to Default",IDIGNORE,174,180,50,14 @@ -2142,26 +1819,22 @@ BEGIN END IDD_RMVVIEWER DIALOGEX 0, 0, 177, 98 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Program to Remove from List of Choices" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LISTBOX IDC_LIST,7,7,163,62,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_LIST,7,7,163,62,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,7,77,50,14 PUSHBUTTON "Cancel",IDCANCEL,64,77,50,14 PUSHBUTTON "Help",ID_HELP,120,77,50,14 END IDD_BOOKMARKS DIALOGEX 0, 0, 288, 176 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Organize Bookmarks" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LISTBOX IDC_MENULIST,7,7,274,123,LBS_USETABSTOPS | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_MENULIST,7,7,274,123,LBS_USETABSTOPS | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add Submenu",IDC_ADD,7,135,50,14 PUSHBUTTON "&Edit...",IDC_CHANGE,63,135,50,14 PUSHBUTTON "Dele&te",IDC_REMOVE,119,135,50,14 @@ -2175,74 +1848,57 @@ BEGIN END IDD_LABEL_ADD_REPLACE DIALOGEX 0, 0, 315, 202 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Add/Replace Files Listed in Label" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Replace list of file revisions in label with contents of client &workspace", - IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,7, - 259,10 + CONTROL "Replace list of file revisions in label with contents of client &workspace",IDC_RADIO1, + "Button",BS_AUTORADIOBUTTON | WS_GROUP,7,7,259,10 CONTROL "Add/Replace only the following &files:",IDC_RADIO2, "Button",BS_AUTORADIOBUTTON,7,18,208,10 - CONTROL "Add/Replace only the following files, do not &delete any files:", - IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,7,29,244,10 - LISTBOX IDC_LIST,7,42,301,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | - LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "Remo&ve selected item(s) from list",IDC_REMOVE,168,108, - 140,14,BS_MULTILINE + CONTROL "Add/Replace only the following files, do not &delete any files:",IDC_RADIO3, + "Button",BS_AUTORADIOBUTTON,7,29,244,10 + LISTBOX IDC_LIST,7,42,301,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Remo&ve selected item(s) from list",IDC_REMOVE,168,108,140,14,BS_MULTILINE GROUPBOX "Revision to use",IDC_STATIC1,7,120,301,58 CONTROL "Revisions in &client's workspace",IDC_USECLIENTREV, "Button",BS_AUTORADIOBUTTON | WS_GROUP,13,129,152,10 - CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button", - BS_AUTORADIOBUTTON,13,142,50,10 - CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,13, - 156,32,10 + CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button",BS_AUTORADIOBUTTON,13,142,50,10 + CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,13,156,32,10 EDITTEXT IDC_F_REVNBR,64,140,43,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_F_COMBO,47,155,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_F_COMBO,47,155,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_F_SYMBOL,110,155,138,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "&Browse...",IDC_F_BROWSE,252,154,50,14 - CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,90, - 168,178,9 + CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,90,168,178,9 DEFPUSHBUTTON "&Load Label with File List",IDOK,51,181,89,14 PUSHBUTTON "&Preview",ID_PREVIEW,145,181,50,14 PUSHBUTTON "Cancel",IDCANCEL,201,181,50,14 PUSHBUTTON "Help",ID_HELP,258,181,50,14 - CONTROL "Default",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,268,7,38,10 - CONTROL "Default",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,268,18, - 38,10 - CONTROL "Default",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,268,29, - 38,10 + CONTROL "Default",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON | WS_GROUP,268,7,38,10 + CONTROL "Default",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,268,18,38,10 + CONTROL "Default",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,268,29,38,10 END -IDD_LABEL_DEL_SYNC DIALOG 0, 0, 314, 191 -STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | - WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_LABEL_DEL_SYNC DIALOG 0, 0, 314, 191 +STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Delete/Sync files from the List in Label" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Delete Checked Files from List in Label",IDOK,7,170, - 137,14 + DEFPUSHBUTTON "&Delete Checked Files from List in Label",IDOK,7,170,137,14 PUSHBUTTON "&Preview",ID_PREVIEW,148,170,50,14 PUSHBUTTON "Cancel",IDCANCEL,202,170,50,14 PUSHBUTTON "Help",ID_HELP,257,170,50,14 - CTEXT "This is used to calculate the dimensions of the CReviewList listbox", - IDC_LISTRECT,7,7,300,157,SS_CENTERIMAGE | NOT WS_VISIBLE + CTEXT "This is used to calculate the dimensions of the CReviewList listbox",IDC_LISTRECT,7,7,300,157,SS_CENTERIMAGE | NOT WS_VISIBLE END IDD_DIFFASSOCIATION DIALOGEX 0, 0, 270, 108 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Diff Accociation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Enter file &extension, using semicolons to separate multiple extensions (e.g. "".cpp"" or "".h;.c;.cpp""):", - IDC_STATIC,7,7,201,21 + LTEXT "Enter file &extension, using semicolons to separate multiple extensions (e.g. "".cpp"" or "".h;.c;.cpp""):",IDC_STATIC,7,7,201,21 EDITTEXT IDC_EXTENSION,7,29,256,15,ES_AUTOHSCROLL - LTEXT "&Application for Diffing this file type:", - IDC_APP_PROMPT,7,50,200,11 + LTEXT "&Application for Diffing this file type:",IDC_APP_PROMPT,7,50,200,11 EDITTEXT IDC_APPLICATION,7,63,200,15,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,213,64,50,14 DEFPUSHBUTTON "OK",IDOK,157,87,50,14 @@ -2250,74 +1906,51 @@ BEGIN END IDD_DIFF2 DIALOGEX 0, 0, 314, 216 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Diff 2 Files/Revisions" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT " &First file:",IDC_STATIC_1,7,10,54,8 EDITTEXT IDC_EDIT1,62,7,245,14,ES_AUTOHSCROLL GROUPBOX "File version to use",IDC_STATIC1,7,22,300,75 - CONTROL "&Head revision",IDC_USEHEADREV,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,31,118,10 - CONTROL "File in &client workspace",IDC_CLIENTFILE,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,45,217,10 - CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,59,50,10 - CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,73,32,10 - EDITTEXT IDC_F_REVNBR,64,57,43,12,ES_AUTOHSCROLL | ES_NUMBER | - WS_DISABLED - COMBOBOX IDC_F_COMBO,47,72,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + CONTROL "&Head revision",IDC_USEHEADREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,31,118,10 + CONTROL "File in &client workspace",IDC_CLIENTFILE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,45,217,10 + CONTROL "&Revision #:",IDC_F_ISREVNBR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,59,50,10 + CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,73,32,10 + EDITTEXT IDC_F_REVNBR,64,57,43,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + COMBOBOX IDC_F_COMBO,47,72,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_F_SYMBOL,110,72,138,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "&Browse...",IDC_F_BROWSE,252,71,50,14,WS_DISABLED - CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,93,86, - 170,9 - CONTROL "Default",IDC_RADIO_1_HEAD,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,261,31,42,10 - CONTROL "Default",IDC_RADIO_1_CLIENT,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,261,45,42,10 - CONTROL "Default",IDC_RADIO_1_REV,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,261,59,42,10 + CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,93,86,170,9 + CONTROL "Default",IDC_RADIO_1_HEAD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,261,31,42,10 + CONTROL "Default",IDC_RADIO_1_CLIENT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,261,45,42,10 + CONTROL "Default",IDC_RADIO_1_REV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,261,59,42,10 LTEXT " &Second file:",IDC_STATIC_2,7,105,55,8 EDITTEXT IDC_EDIT2,62,102,245,14,ES_AUTOHSCROLL GROUPBOX "File version to use",IDC_STATIC2,7,117,300,75 - CONTROL "Hea&d revision",IDC_USEHEADREV2,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,126,118,10 - CONTROL "File in c&lient workspace",IDC_CLIENTFILE2,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,140,217,10 - CONTROL "Revisio&n #:",IDC_T_ISREVNBR,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,154,50,10 - CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,168,32,10 - EDITTEXT IDC_T_REVNBR,64,152,43,12,ES_AUTOHSCROLL | ES_NUMBER | - WS_DISABLED - COMBOBOX IDC_T_COMBO,47,167,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + CONTROL "Hea&d revision",IDC_USEHEADREV2,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,126,118,10 + CONTROL "File in c&lient workspace",IDC_CLIENTFILE2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,140,217,10 + CONTROL "Revisio&n #:",IDC_T_ISREVNBR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,154,50,10 + CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,168,32,10 + EDITTEXT IDC_T_REVNBR,64,152,43,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + COMBOBOX IDC_T_COMBO,47,167,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_T_SYMBOL,110,167,138,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Bro&wse...",IDC_T_BROWSE,252,166,50,14,WS_DISABLED - CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,93, - 181,170,9 - CONTROL "Default",IDC_RADIO_2_HEAD,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,261,126,42,10 - CONTROL "Default",IDC_RADIO_2_CLIENT,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,261,140,42,10 - CONTROL "Default",IDC_RADIO_2_REV,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,261,154,42,10 + CTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,93,181,170,9 + CONTROL "Default",IDC_RADIO_2_HEAD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,261,126,42,10 + CONTROL "Default",IDC_RADIO_2_CLIENT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,261,140,42,10 + CONTROL "Default",IDC_RADIO_2_REV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,261,154,42,10 DEFPUSHBUTTON "OK",IDOK,148,196,50,14 PUSHBUTTON "Cancel",IDCANCEL,202,196,50,14 PUSHBUTTON "Help",IDHELP,257,196,50,14 END IDD_FAVORITES DIALOGEX 0, 0, 289, 176 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Connections" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LISTBOX IDC_MENULIST,7,7,275,123,LBS_USETABSTOPS | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_MENULIST,7,7,275,123,LBS_USETABSTOPS | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add...",IDC_ADD,7,135,50,14 PUSHBUTTON "&Edit...",IDC_CHANGE,63,135,50,14 PUSHBUTTON "Dele&te",IDC_REMOVE,119,135,50,14 @@ -2331,8 +1964,7 @@ BEGIN END IDD_FAVEDITDLG DIALOGEX 0, 0, 236, 111 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Connection" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -2345,45 +1977,33 @@ BEGIN RTEXT "&Description:",IDC_STATIC,7,60,50,8 EDITTEXT IDC_DESCRIPTION,64,58,165,14,ES_AUTOHSCROLL RTEXT "Menu item is a",IDC_STATIC_TITLE,20,77,57,8 - CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,92,77,56,10 - CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,151,77,45,10 + CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,92,77,56,10 + CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,151,77,45,10 DEFPUSHBUTTON "OK",IDOK,125,90,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,179,90,50,14 END IDD_OLDCHG_FILTER DIALOGEX 0, 0, 272, 177 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Filter Submitted Changelists" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Changelist criteria",IDC_CRITERIA,7,5,257,56 - CONTROL "&Client:",IDC_USE_CLIENT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,18,37,10 + CONTROL "&Client:",IDC_USE_CLIENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,18,37,10 EDITTEXT IDC_CLIENT,53,17,100,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE_CLIENTS,158,16,50,14 - CONTROL "&User:",IDC_USE_USER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,33,37,10 + CONTROL "&User:",IDC_USE_USER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,33,37,10 EDITTEXT IDC_USER,53,32,100,14,ES_AUTOHSCROLL PUSHBUTTON "Bro&wse...",IDC_BROWSE_USERS,158,32,50,14 - CONTROL "&Include integrations",IDC_INCLUDE_INTEGS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,48,116,10 + CONTROL "&Include integrations",IDC_INCLUDE_INTEGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,48,116,10 GROUPBOX "Associated files",IDC_FILES,7,63,257,88 - CONTROL "&Any",IDC_FILE_ANY,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,15,73,29,10 - CONTROL "&My Client",IDC_FILE_MYCLIENT,"Button", - BS_AUTORADIOBUTTON,15,87,92,10 - CONTROL "&File filter:",IDC_FILE_FILESPEC,"Button", - BS_AUTORADIOBUTTON,15,101,60,10 - CONTROL "&Selected files:",IDC_FILE_SELECTED,"Button", - BS_AUTORADIOBUTTON,15,116,61,10 - COMBOBOX IDC_FILESPEC,76,99,179,160,CBS_DROPDOWN | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "&Any",IDC_FILE_ANY,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,73,29,10 + CONTROL "&My Client",IDC_FILE_MYCLIENT,"Button",BS_AUTORADIOBUTTON,15,87,92,10 + CONTROL "&File filter:",IDC_FILE_FILESPEC,"Button",BS_AUTORADIOBUTTON,15,101,60,10 + CONTROL "&Selected files:",IDC_FILE_SELECTED,"Button",BS_AUTORADIOBUTTON,15,116,61,10 + COMBOBOX IDC_FILESPEC,76,99,179,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_SELECTED,76,114,179,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "Use client s&yntax",IDC_USE_CLIENT_SYNTAX,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,76,133,79,10 + CONTROL "Use client s&yntax",IDC_USE_CLIENT_SYNTAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,76,133,79,10 PUSHBUTTON "Set Revision Ran&ge...",IDC_SETREVRANGE,158,132,97,14 DEFPUSHBUTTON "OK",IDOK,104,156,50,14 PUSHBUTTON "Cancel",IDCANCEL,158,156,50,14 @@ -2391,63 +2011,46 @@ BEGIN END IDD_OLDCHG_REVRANGE DIALOGEX 0, 0, 272, 181 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Set Revision Range" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Starting with",IDC_BEGIN,7,7,258,72 - CONTROL "&1st revision",IDC_FROM_IS1STREV,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,18,65,10 + CONTROL "&1st revision",IDC_FROM_IS1STREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,18,65,10 CONTROL "Revision you hav&e on your client",IDC_FROM_ISHAVEREV, "Button",BS_AUTORADIOBUTTON,11,30,119,10 - CONTROL "&Revision #:",IDC_FROM_ISREVNBR,"Button", - BS_AUTORADIOBUTTON,11,42,47,10 - CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,11, - 56,32,10 - CONTROL "E&xclusive",IDC_F_ISHAVEEXCLUDE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,133,30,45,10 + CONTROL "&Revision #:",IDC_FROM_ISREVNBR,"Button",BS_AUTORADIOBUTTON,11,42,47,10 + CONTROL "&Other:",IDC_F_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,11,56,32,10 + CONTROL "E&xclusive",IDC_F_ISHAVEEXCLUDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,30,45,10 EDITTEXT IDC_F_REVNBR,63,41,42,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_F_COMBO,45,55,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_F_COMBO,45,55,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_F_SYMBOL,108,55,98,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "&Browse...",IDC_F_BROWSE,209,54,50,14 - RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,34,68, - 171,9 + RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_F_STATIC,34,68,171,9 GROUPBOX "Ending with",IDC_END,7,80,258,73 CONTROL "Revision you ha&ve on your client",IDC_TO_ISHAVEREV, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11, - 91,119,10 - CONTROL "Hea&d revision",IDC_TO_ISHEADREV,"Button", - BS_AUTORADIOBUTTON,11,103,86,10 - CONTROL "Revisio&n #:",IDC_TO_ISREVNBR,"Button", - BS_AUTORADIOBUTTON,11,116,48,10 - CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,11, - 130,32,10 - CONTROL "Inc&lusive",IDC_T_ISHAVEINCLUDE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,133,91,41,10 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,91,119,10 + CONTROL "Hea&d revision",IDC_TO_ISHEADREV,"Button",BS_AUTORADIOBUTTON,11,103,86,10 + CONTROL "Revisio&n #:",IDC_TO_ISREVNBR,"Button",BS_AUTORADIOBUTTON,11,116,48,10 + CONTROL "O&ther:",IDC_T_ISSYMBOL,"Button",BS_AUTORADIOBUTTON,11,130,32,10 + CONTROL "Inc&lusive",IDC_T_ISHAVEINCLUDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,91,41,10 EDITTEXT IDC_T_REVNBR,63,115,42,12,ES_AUTOHSCROLL | WS_DISABLED - COMBOBOX IDC_T_COMBO,45,129,60,48,CBS_DROPDOWNLIST | WS_DISABLED | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_T_COMBO,45,129,60,48,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_T_SYMBOL,108,129,98,12,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Bro&wse...",IDC_T_BROWSE,209,128,50,14 - RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,34, - 142,171,9 + RTEXT "(yyyy/mm/dd or yyyy/mm/dd:hh:mm:ss)",IDC_T_STATIC,34,142,171,9 DEFPUSHBUTTON "OK",IDOK,107,160,50,14 PUSHBUTTON "Cancel",IDCANCEL,161,160,50,14 PUSHBUTTON "Help",IDHELP,215,160,50,14 END IDD_OPTIONSTREE_DIALOG DIALOGEX 0, 0, 345, 210 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Perforce Options" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "",IDC_DLG_AREA,96,0,249,185,NOT WS_VISIBLE - CONTROL "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | - TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,4,4,87,201 + CONTROL "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,4,4,87,201 DEFPUSHBUTTON "OK",IDOK,124,191,50,14 PUSHBUTTON "Cancel",IDCANCEL,179,191,50,14 PUSHBUTTON "Appl&y",IDC_APPLY,234,191,50,14 @@ -2455,678 +2058,488 @@ BEGIN END IDD_PAGE_CONNECTINFO DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Connection" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Connection",IDC_STATIC,4,7,242,56 LTEXT "P4 por&t",IDC_STATIC,13,20,41,10 - COMBOBOX IDC_P4PORT,56,19,115,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_P4PORT,56,19,115,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "P4 cha&rset",IDC_STATIC,13,36,41,10 - COMBOBOX IDC_P4CHARSET,56,34,115,160,CBS_DROPDOWN | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "&Set as default",IDC_PERMANENT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,174,22,64,10 + COMBOBOX IDC_P4CHARSET,56,34,115,160,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "&Set as default",IDC_PERMANENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,22,64,10 LTEXT "port and charset",IDC_STATIC,183,32,58,8 - CONTROL "Always show &connection settings in title bar", - IDC_P4SHOWCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 13,48,161,13 - CONTROL "Show port &# 1st",IDC_SHOWPORT1ST,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,174,48,69,13 + CONTROL "Always show &connection settings in title bar",IDC_P4SHOWCONNECT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,48,161,13 + CONTROL "Show port &# 1st",IDC_SHOWPORT1ST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,48,69,13 GROUPBOX "Data refresh",IDC_STATIC,4,67,242,64 - CONTROL "&Poll server for updates every",IDC_P4AUTOPOLL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,80,116,9 + CONTROL "&Poll server for updates every",IDC_P4AUTOPOLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,80,116,9 LTEXT "&minutes",IDC_STATIC,158,80,36,8 - EDITTEXT IDC_P4AUTOPOLLTIME,129,77,22,14,ES_AUTOHSCROLL | - ES_NUMBER - CONTROL "Poll for &job updates",IDC_POLLJOBS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,97,100,8 - CONTROL "Poll when &inactive",IDC_OKICONIC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,129,97,82,8 - CONTROL "Reload pane &when it is uncovered after", - IDC_RELOADUNCOVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 13,113,146,10 + EDITTEXT IDC_P4AUTOPOLLTIME,129,77,22,14,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Poll for &job updates",IDC_POLLJOBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,97,100,8 + CONTROL "Poll when &inactive",IDC_OKICONIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,97,82,8 + CONTROL "Reload pane &when it is uncovered after",IDC_RELOADUNCOVER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,113,146,10 LTEXT "min&utes",IDC_STATIC,192,113,37,8 - EDITTEXT IDC_RELOADUNCOVERTIME,160,111,22,14,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER - CONTROL "&Log out current connection when exiting P4Win", - IDC_LOGOUTATEXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 136,242,10 + EDITTEXT IDC_RELOADUNCOVERTIME,160,111,22,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "&Log out current connection when exiting P4Win",IDC_LOGOUTATEXIT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,136,242,10 END IDD_PAGE_CHANGELISTS DIALOGEX 0, 0, 249, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Changelists" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Pending changelists",IDC_STATIC,4,0,241,142 CONTROL "Show &open action in changelist pane",IDC_P4SHOWACTIONS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,8,185,13 - CONTROL "Show &partial changelist descriptions of max length", - IDC_P4SHOWCHANGEDESC,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,19,187,13 - EDITTEXT IDC_USELONGCHGLISTDESC,197,19,32,12,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER - CONTROL "E&xpand pending changelists whenever a file or job is added", - IDC_EXPANDCHGLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 10,30,220,13 - CONTROL "Remember pending changelist tree &expansion on application exit", - IDC_REEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,41, - 223,13 - CONTROL "Ena&ble displaying pending changelists for other clients", - IDC_ENABLE_PEND_CHG_OTHER_CLI,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,52,220,13 - CONTROL "Don't submit &unchanged files",IDC_DESEL_UNCHGED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,63,115,13 - CONTROL "Revert unchanged (200&6.1+)",IDC_REVERT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,128,63,112,13 - CONTROL "Provide additional warnings for opening alread&y open file(s)", - IDC_WARNALREADYOPENED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,74,226,13 + CONTROL "Show &partial changelist descriptions of max length",IDC_P4SHOWCHANGEDESC, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,19,187,13 + EDITTEXT IDC_USELONGCHGLISTDESC,197,19,32,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "E&xpand pending changelists whenever a file or job is added",IDC_EXPANDCHGLIST, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,220,13 + CONTROL "Remember pending changelist tree &expansion on application exit",IDC_REEXPAND, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,41,223,13 + CONTROL "Ena&ble displaying pending changelists for other clients",IDC_ENABLE_PEND_CHG_OTHER_CLI, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,52,220,13 + CONTROL "Don't submit &unchanged files",IDC_DESEL_UNCHGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,115,13 + CONTROL "Revert unchanged (200&6.1+)",IDC_REVERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,128,63,112,13 + CONTROL "Provide additional warnings for opening alread&y open file(s)",IDC_WARNALREADYOPENED, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,74,226,13 LTEXT "&Warn if adding more than",IDC_STATIC,10,89,94,8 - EDITTEXT IDC_WARNLIMIT,108,87,32,12,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + EDITTEXT IDC_WARNLIMIT,108,87,32,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "files in a single operation",IDC_STATIC,147,89,88,8 LTEXT "Warn if opening &more than",IDC_STATIC,10,103,97,8 - EDITTEXT IDC_WARNLIMITOPEN,108,101,32,12,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_WARNLIMITOPEN,108,101,32,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "files in a single operation",IDC_STATIC,146,103,89,8 LTEXT "Warn if &diffing more than",IDC_STATIC,10,117,97,8 - EDITTEXT IDC_WARNLIMITDIFF,108,115,32,12,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_WARNLIMITDIFF,108,115,32,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "files in a single operation",IDC_STATIC,146,117,88,8 - CONTROL "Default setting for &reopen files flag when a changelist is submitted", - IDC_AUTO_REOPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10, - 130,232,10 - GROUPBOX "When retrieving submitted changelists from the server", - IDC_STATIC,4,144,241,26 - CONTROL "Retrieve &all",IDC_FETCHALL_RAD,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,157,58,8 - CONTROL "Retrieve &last",IDC_FETCHX_RAD,"Button", - BS_AUTORADIOBUTTON,98,156,58,8 - EDITTEXT IDC_CHANGECOUNT,157,154,32,13,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + CONTROL "Default setting for &reopen files flag when a changelist is submitted",IDC_AUTO_REOPEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,130,232,10 + GROUPBOX "When retrieving submitted changelists from the server",IDC_STATIC,4,144,241,26 + CONTROL "Retrieve &all",IDC_FETCHALL_RAD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,157,58,8 + CONTROL "Retrieve &last",IDC_FETCHX_RAD,"Button",BS_AUTORADIOBUTTON,98,156,58,8 + EDITTEXT IDC_CHANGECOUNT,157,154,32,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER END IDD_PAGE_CLIENTS DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Clients" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Automatically &reload depot && changelists after editing client definition", - IDC_CLEARANDRELOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 4,7,246,13 - CONTROL "Use &Depot name in right hand side of client view", - IDC_USEDEPOTINCLIENTVIEW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,20,195,13 - CONTROL "Use local default client &template to create new client workspaces", - IDC_LOCALCLITEMPLATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,33,246,13 - CONTROL "Use client spec submit options as defaults on &Submit form (2006.2+)", - IDC_USECLISUBMITOPTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,46,245,13 + CONTROL "Automatically &reload depot && changelists after editing client definition",IDC_CLEARANDRELOAD, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,246,13 + CONTROL "Use &Depot name in right hand side of client view",IDC_USEDEPOTINCLIENTVIEW, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,20,195,13 + CONTROL "Use local default client &template to create new client workspaces",IDC_LOCALCLITEMPLATE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,33,246,13 + CONTROL "Use client spec submit options as defaults on &Submit form (2006.2+)",IDC_USECLISUBMITOPTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,245,13 END IDD_PAGE_JOBS DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Jobs" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "When retrieving jobs",IDC_STATIC,4,7,242,64 + GROUPBOX "When retrieving jobs",IDC_STATIC,4,20,242,64 CONTROL "Retrieve &all jobs from server",IDC_FETCHALLJOBS_RAD, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11, - 17,144,8 - CONTROL "Retrieve &maximum of",IDC_FETCHXJOBS_RAD,"Button", - BS_AUTORADIOBUTTON,11,29,81,8 - EDITTEXT IDC_JOBCOUNT,95,27,32,13,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER - LTEXT "jobs from server",IDC_STATIC,133,28,103,8 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,30,144,8 + CONTROL "Retrieve &maximum of",IDC_FETCHXJOBS_RAD,"Button",BS_AUTORADIOBUTTON,11,42,81,8 + EDITTEXT IDC_JOBCOUNT,95,40,32,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + LTEXT "jobs from server",IDC_STATIC,133,41,103,8 CONTROL "&Poll for job updates when polling server",IDC_POLLJOBS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,76,226,8 - PUSHBUTTON "&Set Job List Columns...",ID_JOB_CONFIGURE,146,93,100, - 15 - LTEXT "(selected by descending job name order)",IDC_STATIC,20, - 41,208,8 - LTEXT "Note: Job filter (if present) is applied when jobs are retrieved", - IDC_STATIC,13,58,225,8 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,89,226,8 + PUSHBUTTON "&Set Job List Columns...",ID_JOB_CONFIGURE,146,106,100,15 + LTEXT "(selected by descending job name order)",IDC_STATIC,20,54,208,8 + LTEXT "Note: Job filter (if present) is applied when jobs are retrieved",IDC_STATIC,13,71,225,8 + CONTROL "Enable Jobs Support",IDC_ENABLEJOBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,5,226,8 END IDD_PAGE_DIALOGS DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Prompt before discarding &changes to a specification (Esc key)", - IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,227, - 10 - CONTROL "After creating a &new client, prompt to sync files in client view", - IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,22, - 227,10 - CONTROL "After changing client &view, prompt to sync files", - IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,37, - 227,10 + CONTROL "Prompt before discarding &changes to a specification (Esc key)",IDC_CHECK1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,227,10 + CONTROL "After creating a &new client, prompt to sync files in client view",IDC_CHECK2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,22,227,10 + CONTROL "After changing client &view, prompt to sync files",IDC_CHECK3, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,37,227,10 END IDD_PAGE_HISTORY DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Revision History" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "When retrieving revision history records",IDC_STATIC,4, - 7,242,36 - CONTROL "Retrieve &all revision history records from server", - IDC_FETCHALLHIST_RAD,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,14,17,222,8 - CONTROL "Retrieve &last",IDC_FETCHXHIST_RAD,"Button", - BS_AUTORADIOBUTTON,14,29,54,8 - EDITTEXT IDC_HISTCOUNT,70,27,32,13,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + GROUPBOX "When retrieving revision history records",IDC_STATIC,4,7,242,36 + CONTROL "Retrieve &all revision history records from server",IDC_FETCHALLHIST_RAD, + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,17,222,8 + CONTROL "Retrieve &last",IDC_FETCHXHIST_RAD,"Button",BS_AUTORADIOBUTTON,14,29,54,8 + EDITTEXT IDC_HISTCOUNT,70,27,32,13,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "history records from server",IDC_STATIC,107,29,129,8 - CONTROL "Show the Display &branching history option in revision history dialog", - IDC_ENABLE_REVHIST_SHOW_INTEGS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,45,242,13 - CONTROL "Use &short descriptions for changelists", - IDC_USE_SHORT_REVHIST_DESC,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,61,242,10 + CONTROL "Show the Display &branching history option in revision history dialog",IDC_ENABLE_REVHIST_SHOW_INTEGS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,45,242,13 + CONTROL "Use &short descriptions for changelists",IDC_USE_SHORT_REVHIST_DESC, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,61,242,10 END IDD_PAGE_PANES DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Perforce Objects" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Show &icons using all possible colors", - IDC_USEALLICONCOLORS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,7,197,10 - LTEXT "( Requires restarting P4Win for changes to take effect )", - IDC_STATIC,14,19,219,8 - CONTROL "Show Include inte&grations option when filtering changes and jobs", - IDC_ENABLE_SUBCHG_INTEG_FILTER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,30,235,13 + CONTROL "Show &icons using all possible colors",IDC_USEALLICONCOLORS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,197,10 + LTEXT "( Requires restarting P4Win for changes to take effect )",IDC_STATIC,14,19,219,8 + CONTROL "Show Include inte&grations option when filtering changes and jobs",IDC_ENABLE_SUBCHG_INTEG_FILTER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,235,13 END IDD_PAGE_DISPLAY DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "When this dialog starts up, &expand all option tree nodes", - IDC_AUTOEXPANDOPTIONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,7,242,13 + CONTROL "When this dialog starts up, &expand all option tree nodes",IDC_AUTOEXPANDOPTIONS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,242,13 GROUPBOX "Start this dialog",IDC_STATIC,4,22,242,58 - CONTROL "In &context sensitive mode",IDC_RADIO1,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,48,222,10 - CONTROL "At the page &previously displayed when this dialog was last closed", - IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11, - 62,224,10 - CONTROL "Always at the &top page (default)",IDC_RADIO3,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,11,34,225,10 + CONTROL "In &context sensitive mode",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,48,222,10 + CONTROL "At the page &previously displayed when this dialog was last closed",IDC_RADIO2, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,62,224,10 + CONTROL "Always at the &top page (default)",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,34,225,10 END IDD_PAGE_SPECS DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Specifications" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Select fixed width font for specification multi-line text fields:", - IDC_STATIC,4,1,236,9,SS_CENTERIMAGE + LTEXT "Select fixed width font for specification multi-line text fields:",IDC_STATIC,4,1,236,9,SS_CENTERIMAGE LTEXT "&Font:",ID_STATIC,4,12,40,9 - COMBOBOX IDC_FONT,4,22,137,54,CBS_SIMPLE | CBS_AUTOHSCROLL | - CBS_SORT | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FONT,4,22,137,54,CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_SORT | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Font &style:",ID_STATIC1,145,12,44,9 - COMBOBOX IDC_STYLE,145,22,64,54,CBS_SIMPLE | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STYLE,145,22,64,54,CBS_SIMPLE | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Si&ze:",ID_STATIC2,213,12,30,9 - COMBOBOX IDC_FONTSIZE,214,22,32,54,CBS_SIMPLE | - CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FONTSIZE,214,22,32,54,CBS_SIMPLE | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sample",ID_SAMPLE_FRAME,4,76,242,40,WS_GROUP - CTEXT "Helga studies the CBugFactory class",IDC_SAMPLE,10,85, - 228,29,SS_NOPREFIX | SS_CENTERIMAGE - LTEXT "&Minimum number of lines in multi-line edit field in spec edit dialog is", - IDC_STATIC,4,122,216,8 - EDITTEXT IDC_MINMULTILINESIZE,225,121,21,12,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Place prompts &above multi-line fields ", - IDC_ALLOWPROMPTABOVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,134,217,10 - CONTROL "&Preserve formatting for text fields in all specification dialogs", - IDC_PRESERVESPECFORMAT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,145,220,13 - CONTROL "&Wrap spec descriptions at ",IDC_DESCWRAPSW,"Button", - BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,4,160,97,10 - EDITTEXT IDC_DESCWRAP,103,158,21,12,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + CTEXT "Helga studies the CBugFactory class",IDC_SAMPLE,10,85,228,29,SS_NOPREFIX | SS_CENTERIMAGE + LTEXT "&Minimum number of lines in multi-line edit field in spec edit dialog is",IDC_STATIC,4,122,216,8 + EDITTEXT IDC_MINMULTILINESIZE,225,121,21,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Place prompts &above multi-line fields ",IDC_ALLOWPROMPTABOVE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,134,217,10 + CONTROL "&Preserve formatting for text fields in all specification dialogs",IDC_PRESERVESPECFORMAT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,145,220,13 + CONTROL "&Wrap spec descriptions at ",IDC_DESCWRAPSW,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,4,160,97,10 + EDITTEXT IDC_DESCWRAP,103,158,21,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "characters",IDC_STATIC,132,160,72,8 - CONTROL "Automatically mi&nimize any spec edit dialog when pane is covered", - IDC_AUTOMINEDITDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 4,173,242,10 + CONTROL "Automatically mi&nimize any spec edit dialog when pane is covered",IDC_AUTOMINEDITDLG, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,173,242,10 END IDD_PAGE_AUTORESOLVE DIALOGEX 0, 0, 249, 176 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Resolve" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Set default type for auto resolve",IDC_STATIC,4,7,241, - 73 - CONTROL "Accept &theirs",IDC_DEFAULTTHEIRS,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,65,165,10 - CONTROL "Accept &yours",IDC_DEFAULTYOURS,"Button", - BS_AUTORADIOBUTTON,14,53,167,10 - CONTROL "&Safe automatic resolve",IDC_DEFAULTSAFE,"Button", - BS_AUTORADIOBUTTON,14,29,168,10 + GROUPBOX "Set default type for auto resolve",IDC_STATIC,4,7,241,73 + CONTROL "Accept &theirs",IDC_DEFAULTTHEIRS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,65,165,10 + CONTROL "Accept &yours",IDC_DEFAULTYOURS,"Button",BS_AUTORADIOBUTTON,14,53,167,10 + CONTROL "&Safe automatic resolve",IDC_DEFAULTSAFE,"Button",BS_AUTORADIOBUTTON,14,29,168,10 CONTROL "Auto&matic resolve (initial setting)",IDC_DEFAULTAUTO, "Button",BS_AUTORADIOBUTTON,14,17,169,10 - CONTROL "Automatic resolve, including con&flict markers", - IDC_DEFAULTMARKERS,"Button",BS_AUTORADIOBUTTON,14,41,173, - 10 - GROUPBOX "Set default type for 3-way interactive resolve", - IDC_STATIC,4,83,241,47 - CONTROL "Accept yo&urs",IDC_DEFAULTYOURS3,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,93,167,10 - CONTROL "Accept th&eirs",IDC_DEFAULTTHEIRS3,"Button", - BS_AUTORADIOBUTTON,14,105,165,10 + CONTROL "Automatic resolve, including con&flict markers",IDC_DEFAULTMARKERS, + "Button",BS_AUTORADIOBUTTON,14,41,173,10 + GROUPBOX "Set default type for 3-way interactive resolve",IDC_STATIC,4,83,241,47 + CONTROL "Accept yo&urs",IDC_DEFAULTYOURS3,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,93,167,10 + CONTROL "Accept th&eirs",IDC_DEFAULTTHEIRS3,"Button",BS_AUTORADIOBUTTON,14,105,165,10 CONTROL "Accept mer&ged (initial setting)",IDC_DEFAULTMERGED3, "Button",BS_AUTORADIOBUTTON,14,117,165,10 - GROUPBOX "Set default type for 2-way interactive resolve", - IDC_STATIC,4,133,241,36 + GROUPBOX "Set default type for 2-way interactive resolve",IDC_STATIC,4,133,241,36 CONTROL "Accept y&ours (initial setting)",IDC_DEFAULTYOURS2, "Button",BS_AUTORADIOBUTTON | WS_GROUP,14,143,167,10 - CONTROL "Accept t&heirs",IDC_DEFAULTTHEIRS2,"Button", - BS_AUTORADIOBUTTON,14,155,165,10 + CONTROL "Accept t&heirs",IDC_DEFAULTTHEIRS2,"Button",BS_AUTORADIOBUTTON,14,155,165,10 END IDD_PAGE_LABELS DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Labels" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "List label files in a &dialog rather than in the status pane", - IDC_LABEL_FILES_DIALOGBOX,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,7,242,13 - CONTROL "Show details in Status pane for Add/Replace &preview", - IDC_PREVIEWSHOWSDETAILS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,20,242,10 + CONTROL "List label files in a &dialog rather than in the status pane",IDC_LABEL_FILES_DIALOGBOX, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,242,13 + CONTROL "Show details in Status pane for Add/Replace &preview",IDC_PREVIEWSHOWSDETAILS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,20,242,10 GROUPBOX "Set file drag and drop action",IDC_STATIC,4,34,242,101 CONTROL "&Show drag and drop menu (default)",ID_LABELDD_SHOWMENU, "Button",BS_AUTORADIOBUTTON | WS_GROUP,13,118,200,9 CONTROL "&Add/Replace files listed in label",ID_LABELDD_SYNC, "Button",BS_AUTORADIOBUTTON,13,46,200,9 - CONTROL "Delete s&ome files listed in label", - ID_LABELDD_DELETEFILES,"Button",BS_AUTORADIOBUTTON,13,58, - 200,9 - CONTROL "Syn&c specific files in label to client", - ID_LABELDD_SYNC_CLIENT,"Button",BS_AUTORADIOBUTTON,13,70, - 200,9 - CONTROL "Add depo&t selections to label view", - ID_LABELDD_ADDTOLABELVIEW,"Button",BS_AUTORADIOBUTTON,13, - 82,220,10 - CONTROL "Set labels &filter for selected files", - ID_LABELFILTERDD_SETVIEW,"Button",BS_AUTORADIOBUTTON,13, - 94,200,9 - CONTROL "Set labels filter for selected files and &revisions", - ID_LABELFILTERDD_SETVIEWREV,"Button",BS_AUTORADIOBUTTON, - 13,106,200,9 + CONTROL "Delete s&ome files listed in label",ID_LABELDD_DELETEFILES, + "Button",BS_AUTORADIOBUTTON,13,58,200,9 + CONTROL "Syn&c specific files in label to client",ID_LABELDD_SYNC_CLIENT, + "Button",BS_AUTORADIOBUTTON,13,70,200,9 + CONTROL "Add depo&t selections to label view",ID_LABELDD_ADDTOLABELVIEW, + "Button",BS_AUTORADIOBUTTON,13,82,220,10 + CONTROL "Set labels &filter for selected files",ID_LABELFILTERDD_SETVIEW, + "Button",BS_AUTORADIOBUTTON,13,94,200,9 + CONTROL "Set labels filter for selected files and &revisions",ID_LABELFILTERDD_SETVIEWREV, + "Button",BS_AUTORADIOBUTTON,13,106,200,9 END IDD_PAGE_STATUSPANE DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Status" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Show p&4 commands in the status pane", - IDC_P4SHOWCOMMANDTRACE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,7,220,10 + CONTROL "Show p&4 commands in the status pane",IDC_P4SHOWCOMMANDTRACE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,7,220,10 CONTROL "Show ×tamp for status messages",IDC_SHOWSTATUSTIME, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,142,10 - CONTROL "Use &24 hour clock",IDC_USE24HOURCLOCK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,148,19,82,10 - CONTROL "Show stat&us messages",IDC_SHOW_STATUSMSGS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,31,222,10 - CONTROL "Show toolti&ps for truncated status lines", - IDC_SHOWTRUNCTOOLTIP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,43,224,10 - CONTROL "Use &Notepad for displaying warnings and errors", - IDC_USE_NOTEPAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 55,221,10 - CONTROL "Enable error reporting when application encounters a problem", - IDC_ALLOW_ER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,67, - 235,10 + CONTROL "Use &24 hour clock",IDC_USE24HOURCLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,19,82,10 + CONTROL "Show stat&us messages",IDC_SHOW_STATUSMSGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,31,222,10 + CONTROL "Show toolti&ps for truncated status lines",IDC_SHOWTRUNCTOOLTIP, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,43,224,10 + CONTROL "Use &Notepad for displaying warnings and errors",IDC_USE_NOTEPAD, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,55,221,10 + CONTROL "Enable error reporting when application encounters a problem",IDC_ALLOW_ER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,67,235,10 LTEXT "Lines in status pane &buffer:",IDC_STATIC,4,83,102,10 - EDITTEXT IDC_MAXSTATUSLINES,107,80,40,14,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_MAXSTATUSLINES,107,80,40,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER PUSHBUTTON "&Reset",IDC_SETTODEFAULT,170,80,50,14 END IDD_PAGE_DIFF DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Diff" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "&Perforce diff (recommended)",IDC_DIFF_P4_RAD,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,4,7,126,11 + CONTROL "&Perforce diff (recommended)",IDC_DIFF_P4_RAD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,7,126,11 CONTROL "&User supplied diff application",IDC_DIFF_OTHER_RAD, "Button",BS_AUTORADIOBUTTON,4,43,131,11 - CONTROL "P4&WinDiff",IDC_DIFF_P4DIFF_RAD,"Button", - BS_AUTORADIOBUTTON,4,31,105,10 - RTEXT "Chars per &tab setting:",IDC_TABWIDTH_CAPTION,13,20,79, - 11 - EDITTEXT IDC_TABWIDTH,94,19,20,12,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER - CONTROL "Igno&re line endings",IDC_WHTSP_LINEEND,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,145,16,99,10 - CONTROL "&Ignore whitespace diffs",IDC_WHTSP_IGNOREDIFFS,"Button", - BS_AUTORADIOBUTTON,145,25,99,10 - CONTROL "I&gnore all whitespace",IDC_WHTSP_IGNOREALL,"Button", - BS_AUTORADIOBUTTON,145,34,99,10 - CONTROL "&Show all diffs",IDC_WHTSP_INCLUDE,"Button", - BS_AUTORADIOBUTTON,145,7,99,10 - CONTROL "Use diff program pre&fs",IDC_WHTSP_PREFS,"Button", - BS_AUTORADIOBUTTON,145,44,99,10 + CONTROL "P4&WinDiff",IDC_DIFF_P4DIFF_RAD,"Button",BS_AUTORADIOBUTTON,4,31,105,10 + RTEXT "Chars per &tab setting:",IDC_TABWIDTH_CAPTION,13,20,79,11 + EDITTEXT IDC_TABWIDTH,94,19,20,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Igno&re line endings",IDC_WHTSP_LINEEND,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,145,16,99,10 + CONTROL "&Ignore whitespace diffs",IDC_WHTSP_IGNOREDIFFS,"Button",BS_AUTORADIOBUTTON,145,25,99,10 + CONTROL "I&gnore all whitespace",IDC_WHTSP_IGNOREALL,"Button",BS_AUTORADIOBUTTON,145,34,99,10 + CONTROL "&Show all diffs",IDC_WHTSP_INCLUDE,"Button",BS_AUTORADIOBUTTON,145,7,99,10 + CONTROL "Use diff program pre&fs",IDC_WHTSP_PREFS,"Button",BS_AUTORADIOBUTTON,145,44,99,10 EDITTEXT IDC_DIFF_USERAPP,4,56,195,14,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "&Browse...",IDC_DIFFBROWSE,201,56,41,14 - CONTROL "&Console application",IDC_DIFFCONSOLE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,72,83,9 - CONTROL "Close window upon e&xit",IDC_DIFFCLOSE,"Button", - BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,147,72,95,9 - CONTROL "&Optional args",IDC_DIFFOPTARGCHK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,85,60,10 + CONTROL "&Console application",IDC_DIFFCONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,72,83,9 + CONTROL "Close window upon e&xit",IDC_DIFFCLOSE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,147,72,95,9 + CONTROL "&Optional args",IDC_DIFFOPTARGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,85,60,10 EDITTEXT IDC_DIFFOPTARGS,67,83,179,14,ES_AUTOHSCROLL - GROUPBOX "Override diff program for specific file extensions", - IDC_STATIC,4,100,242,63 + GROUPBOX "Override diff program for specific file extensions",IDC_STATIC,4,100,242,63 LTEXT "Ext",IDC_STATIC,12,108,32,10 LTEXT "Application",IDC_STATIC,55,108,167,10 - LISTBOX IDC_P4ASSAPPS,9,119,190,39,LBS_SORT | LBS_USETABSTOPS | - LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_P4ASSAPPS,9,119,190,39,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add...",IDC_ADDAPP,201,119,39,12 PUSHBUTTON "&Delete",IDC_DELAPP,201,133,39,12 PUSHBUTTON "&Edit...",IDC_EDAPP,201,146,39,12 - CONTROL "Al&low diff of binary files",IDC_DIFFBINARY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,166,145,10 + CONTROL "Al&low diff of binary files",IDC_DIFFBINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,166,145,10 CONTROL "Diff program runs as a &modal dialog",IDC_DIFFMODAL, - "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | - WS_TABSTOP,4,175,233,10 + "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,4,175,233,10 END IDD_PAGE_MERGE DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Merge" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "&Perforce merge (recommended)",IDC_MRG_P4_RAD,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,4,7,134,11 + CONTROL "&Perforce merge (recommended)",IDC_MRG_P4_RAD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,7,134,11 CONTROL "&User supplied merge application",IDC_MRG_OTHER_RAD, "Button",BS_AUTORADIOBUTTON,4,44,140,9 - CONTROL "P4&WinMerge",IDC_MRG_P4DIFF_RAD,"Button", - BS_AUTORADIOBUTTON,4,31,63,10 - RTEXT "Chars per &tab setting:",IDC_MRGTABWIDTH_CAPTION,13,20, - 79,11 - EDITTEXT IDC_MRGTABWIDTH,94,19,20,12,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER - CONTROL "Igno&re line endings",IDC_WHTSP_LINEEND2,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,149,16,99,10 - CONTROL "&Ignore whitespace diffs",IDC_WHTSP_IGNOREDIFFS2,"Button", - BS_AUTORADIOBUTTON,149,25,99,10 - CONTROL "I&gnore all whitespace",IDC_WHTSP_IGNOREALL2,"Button", - BS_AUTORADIOBUTTON,149,34,99,10 - CONTROL "&Show all diffs",IDC_WHTSP_INCLUDE2,"Button", - BS_AUTORADIOBUTTON,149,7,99,10 - CONTROL "Use diff program pre&fs",IDC_WHTSP_PREFS2,"Button", - BS_AUTORADIOBUTTON,149,44,99,10 - CONTROL "Don't show names",IDC_NSF,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,69,32,78,10 + CONTROL "P4&WinMerge",IDC_MRG_P4DIFF_RAD,"Button",BS_AUTORADIOBUTTON,4,31,63,10 + RTEXT "Chars per &tab setting:",IDC_MRGTABWIDTH_CAPTION,13,20,79,11 + EDITTEXT IDC_MRGTABWIDTH,94,19,20,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Igno&re line endings",IDC_WHTSP_LINEEND2,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,149,16,99,10 + CONTROL "&Ignore whitespace diffs",IDC_WHTSP_IGNOREDIFFS2,"Button",BS_AUTORADIOBUTTON,149,25,99,10 + CONTROL "I&gnore all whitespace",IDC_WHTSP_IGNOREALL2,"Button",BS_AUTORADIOBUTTON,149,34,99,10 + CONTROL "&Show all diffs",IDC_WHTSP_INCLUDE2,"Button",BS_AUTORADIOBUTTON,149,7,99,10 + CONTROL "Use diff program pre&fs",IDC_WHTSP_PREFS2,"Button",BS_AUTORADIOBUTTON,149,44,99,10 + CONTROL "Don't show names",IDC_NSF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,32,78,10 EDITTEXT IDC_MERGE_USERAPP,4,56,195,14,ES_AUTOHSCROLL | WS_GROUP - CONTROL "&Console application",IDC_MERGECONSOLE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,74,83,9 - CONTROL "Close &window upon e&xit",IDC_MERGECLOSE,"Button", - BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,147,74,95,9 + CONTROL "&Console application",IDC_MERGECONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,74,83,9 + CONTROL "Close &window upon e&xit",IDC_MERGECLOSE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,147,74,95,9 PUSHBUTTON "&Browse...",IDC_MERGEBROWSE,202,56,44,14 - CONTROL "&Optional args",IDC_MERGEOPTARGCHK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,89,60,10 + CONTROL "&Optional args",IDC_MERGEOPTARGCHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,89,60,10 EDITTEXT IDC_MERGEOPTARGS,67,87,179,14,ES_AUTOHSCROLL - GROUPBOX "Override merge program for specific file extensions", - IDC_STATIC,4,108,242,63 + GROUPBOX "Override merge program for specific file extensions",IDC_STATIC,4,108,242,63 LTEXT "Ext",IDC_STATIC,12,116,32,10 LTEXT "Application",IDC_STATIC,55,116,167,10 - LISTBOX IDC_P4ASSAPPS2,9,127,190,39,LBS_SORT | LBS_USETABSTOPS | - LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_P4ASSAPPS2,9,127,190,39,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add...",IDC_ADDAPP,201,127,39,12 PUSHBUTTON "&Delete",IDC_DELAPP,201,141,39,12 PUSHBUTTON "&Edit...",IDC_EDAPP,201,154,39,12 END IDD_PAGE_EDITORS DIALOGEX 0, 0, 250, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Edit/View" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Viewers/Editors (override specific Windows file associations)", - IDC_STATIC,4,0,242,66 + GROUPBOX "Viewers/Editors (override specific Windows file associations)",IDC_STATIC,4,0,242,66 LTEXT "Ext",IDC_STATIC,12,8,18,10 LTEXT "Application",IDC_STATIC,53,8,143,10 - LISTBOX IDC_P4ASSAPPS,10,17,187,45,LBS_SORT | LBS_USETABSTOPS | - LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | - WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_P4ASSAPPS,10,17,187,45,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Add...",IDC_ADDAPP,200,17,39,14 PUSHBUTTON "&Delete",IDC_DELAPP,200,32,39,14 PUSHBUTTON "&Edit...",IDC_EDAPP,200,47,39,14 - CONTROL "&Ignore Windows-associated apps for ALL other text files", - IDC_IGNORE_ASSAPPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 4,67,233,10 + CONTROL "&Ignore Windows-associated apps for ALL other text files",IDC_IGNORE_ASSAPPS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,67,233,10 GROUPBOX "Default &text viewer/editor",IDC_STATIC,4,78,242,39 EDITTEXT IDC_P4EDITOR,10,89,176,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,189,89,50,14 - CONTROL "&Console application",IDC_EDITCONSOLE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,105,96,9 - CONTROL "Use the ""View"" application to both &view and edit these file types:", - IDC_EDITUSEVIEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 119,242,10 + CONTROL "&Console application",IDC_EDITCONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,105,96,9 + CONTROL "Use the ""View"" application to both &view and edit these file types:",IDC_EDITUSEVIEW, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,119,242,10 EDITTEXT IDC_EDITUSEVIEWEXTS,4,130,242,14,ES_AUTOHSCROLL - CONTROL "&Never use a temp file when viewing a synced unopened depot file ", - IDC_VIEWUSINGLIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 4,147,242,10 - CONTROL "Always &use a temp file when viewing an unopened depot file ", - IDC_VIEWUSINGTEMP,"Button",BS_AUTORADIOBUTTON,4,159,222, - 10 + CONTROL "&Never use a temp file when viewing a synced unopened depot file ",IDC_VIEWUSINGLIVE, + "Button",BS_AUTORADIOBUTTON | WS_GROUP,4,147,242,10 + CONTROL "Always &use a temp file when viewing an unopened depot file ",IDC_VIEWUSINGTEMP, + "Button",BS_AUTORADIOBUTTON,4,159,222,10 CONTROL "Don't use temp for these e&xtensions:",IDC_VIEWUSINGEXT, "Button",BS_AUTORADIOBUTTON,4,171,138,10 EDITTEXT IDC_USETEMPFORTHESE,143,169,103,14,ES_AUTOHSCROLL END IDD_PAGE_DEPOT DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Depot" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Show &deleted depot files",IDC_P4SHOWDELETED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,4,3,220,13 - CONTROL "Show in Local Views, &hidden files not in Depot", - IDC_SHOWHIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 15,217,13 - CONTROL "Show Perforce file &types in Depot and Changelist panes", - IDC_P4SHOWFTYPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 27,220,13 - CONTROL "Show &local path for depot and changelist files", - IDC_SHOWCLIENTPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 4,39,220,13 + CONTROL "Show &deleted depot files",IDC_P4SHOWDELETED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,3,220,13 + CONTROL "Show in Local Views, &hidden files not in Depot",IDC_SHOWHIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,15,217,13 + CONTROL "Show Perforce file &types in Depot and Changelist panes",IDC_P4SHOWFTYPES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,27,220,13 + CONTROL "Show &local path for depot and changelist files",IDC_SHOWCLIENTPATH, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,39,220,13 CONTROL "Outline depot &file under cursor",IDC_SHOWHIGHLITE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,51,220,13 - CONTROL "Diff &2 folders output to a dialog rather than the status pane", - IDC_DIFF2TODLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4, - 63,242,13 + CONTROL "Diff &2 folders output to a dialog rather than the status pane",IDC_DIFF2TODLG, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,242,13 CONTROL "&Automatic depot tree expansion",IDC_AUTOTREEEXPAND, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,75,242,10 - GROUPBOX "Depot pane file tree expansion upon switching port or client or user", - IDC_STATIC,4,87,242,59 - CONTROL "Do ¬ expand depot",IDC_NODEPOTEXPAND,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,99,92,10 + GROUPBOX "Depot pane file tree expansion upon switching port or client or user",IDC_STATIC,4,87,242,59 + CONTROL "Do ¬ expand depot",IDC_NODEPOTEXPAND,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,99,92,10 CONTROL "Expand depot to &previous location",IDC_EXPAND_TO_PREV, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,114,125,10 - CONTROL "&Expand to",IDC_EXPAND_TO,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,129,46,10 + CONTROL "&Expand to",IDC_EXPAND_TO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,129,46,10 EDITTEXT IDC_EXPANDPATH,60,127,181,12,ES_AUTOHSCROLL LTEXT "Tree expansion timeout &value",IDC_STATIC,4,150,101,8 - EDITTEXT IDC_BUSYWAITTIME,105,148,40,12,ES_CENTER | - ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_BUSYWAITTIME,105,148,40,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER LTEXT "milliseconds",IDC_STATIC,153,150,53,8 - LTEXT "Max number of depot files to sort by e&xtension is", - IDC_STATIC,4,165,163,8 - EDITTEXT IDC_EXTSORTMAX,167,163,40,12,ES_CENTER | ES_AUTOHSCROLL | - ES_NUMBER + LTEXT "Max number of depot files to sort by e&xtension is",IDC_STATIC,4,165,163,8 + EDITTEXT IDC_EXTSORTMAX,167,163,40,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER END IDD_PAGE_TEMPFILES DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Files" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Folder and file explorer program",IDC_STATIC,4,7,242,57 - CONTROL "&Windows Explorer",IDC_WINEXPLORER,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,18,83,10 - CONTROL "&Alternate to Explorer:",IDC_ATLEXPLR,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,10,32,75,10 + CONTROL "&Windows Explorer",IDC_WINEXPLORER,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,18,83,10 + CONTROL "&Alternate to Explorer:",IDC_ATLEXPLR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,32,75,10 EDITTEXT IDC_P4EXPLORER,18,45,173,12,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,195,44,45,14 - CONTROL "Use &2 pane view",IDC_USE_DBLPANE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,101,18,136,10 - GROUPBOX "Default action for drag and drop from Windows Explorer", - IDC_STATIC,4,68,242,31 - CONTROL "&Add only",IDC_ADD,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,18,80,48,10 - CONTROL "&Edit only",IDC_EDIT,"Button",BS_AUTORADIOBUTTON,69,80, - 48,10 - CONTROL "&Both add and edit",IDC_BOTH,"Button", - BS_AUTORADIOBUTTON,120,80,71,10 - CONTROL "&Delete",IDC_DELETE,"Button",BS_AUTORADIOBUTTON,196,80, - 41,10 + CONTROL "Use &2 pane view",IDC_USE_DBLPANE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,101,18,136,10 + GROUPBOX "Default action for drag and drop from Windows Explorer",IDC_STATIC,4,68,242,31 + CONTROL "&Add only",IDC_ADD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,18,80,48,10 + CONTROL "&Edit only",IDC_EDIT,"Button",BS_AUTORADIOBUTTON,69,80,48,10 + CONTROL "&Both add and edit",IDC_BOTH,"Button",BS_AUTORADIOBUTTON,120,80,71,10 + CONTROL "&Delete",IDC_DELETE,"Button",BS_AUTORADIOBUTTON,196,80,41,10 LTEXT "Temp file &directory:",IDC_STATIC,8,104,75,10 EDITTEXT IDC_P4TEMPFILES,18,117,173,12,ES_AUTOHSCROLL PUSHBUTTON "Brows&e...",IDC_BROWSE_DIR,195,116,45,14 END IDD_PAGE_DBLCLICK DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "Double Click Option" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "View unopened files, edit opened files (&default)", - IDC_DBLCLK_DEFAULT,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,9,19,221,10 - CONTROL "Open for &edit *",IDC_DBLCLK_OPEN,"Button", - BS_AUTORADIOBUTTON,9,32,217,10 - CONTROL "Open and edit file &using associated editor *", - IDC_DBLCLK_EDIT,"Button",BS_AUTORADIOBUTTON,9,45,217,10 - CONTROL "Vie&w head revision using associated viewer *", - IDC_DBLCLK_VIEWHEAD,"Button",BS_AUTORADIOBUTTON,9,58,211, - 10 - CONTROL "S&ync to head revision *",IDC_DBLCLK_SYNCTOHEAD,"Button", - BS_AUTORADIOBUTTON,9,71,210,10 - CONTROL "Diff vs head rev i&n depot pane/vs depot version in changelist pane", - IDC_DBLCLK_DIFFHEAD,"Button",BS_AUTORADIOBUTTON,9,84,233, - 10 - CONTROL "Display &properties dialog in both depot and changelist panes", - IDC_DBLCLK_PROP,"Button",BS_AUTORADIOBUTTON,9,97,233,10 - CONTROL "Display revision &history in both depot and changelist panes", - IDC_DBLCLK_REVHIST,"Button",BS_AUTORADIOBUTTON,9,110,233, - 10 - LTEXT " * Double-click option only applies to depot pane", - IDC_STATIC,9,126,222,8 + CONTROL "View unopened files, edit opened files (&default)",IDC_DBLCLK_DEFAULT, + "Button",BS_AUTORADIOBUTTON | WS_GROUP,9,19,221,10 + CONTROL "Open for &edit *",IDC_DBLCLK_OPEN,"Button",BS_AUTORADIOBUTTON,9,32,217,10 + CONTROL "Open and edit file &using associated editor *",IDC_DBLCLK_EDIT, + "Button",BS_AUTORADIOBUTTON,9,45,217,10 + CONTROL "Vie&w head revision using associated viewer *",IDC_DBLCLK_VIEWHEAD, + "Button",BS_AUTORADIOBUTTON,9,58,211,10 + CONTROL "S&ync to head revision *",IDC_DBLCLK_SYNCTOHEAD,"Button",BS_AUTORADIOBUTTON,9,71,210,10 + CONTROL "Diff vs head rev i&n depot pane/vs depot version in changelist pane",IDC_DBLCLK_DIFFHEAD, + "Button",BS_AUTORADIOBUTTON,9,84,233,10 + CONTROL "Display &properties dialog in both depot and changelist panes",IDC_DBLCLK_PROP, + "Button",BS_AUTORADIOBUTTON,9,97,233,10 + CONTROL "Display revision &history in both depot and changelist panes",IDC_DBLCLK_REVHIST, + "Button",BS_AUTORADIOBUTTON,9,110,233,10 + LTEXT " * Double-click option only applies to depot pane",IDC_STATIC,9,126,222,8 GROUPBOX "When you double-click a file",IDC_STATIC,4,7,242,134 END IDD_PAGE_FILEUTIL DIALOGEX 0, 0, 250, 185 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION CAPTION "File Utilities" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Annotate",IDC_STATIC,7,7,236,44 LTEXT "Whitespace:",IDC_WHTSP_CAPTION2,12,20,51,8 - CONTROL "&Show diffs",IDC_WHTSP_INCLUDE2,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,67,19,59,10 - CONTROL "&Ignore diffs",IDC_WHTSP_IGNOREDIFFS2,"Button", - BS_AUTORADIOBUTTON,129,19,58,10 - CONTROL "I&gnore all",IDC_WHTSP_IGNOREALL2,"Button", - BS_AUTORADIOBUTTON,194,19,47,10 - CONTROL "Include i&ntegrations if using changelist numbers", - IDC_INCLUDEINTEGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 12,33,219,13 - CONTROL "Time Lapse &View includes integrations ", - IDC_INCLUDEINTEGSTLV,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,55,219,13 + CONTROL "&Show diffs",IDC_WHTSP_INCLUDE2,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,67,19,59,10 + CONTROL "&Ignore diffs",IDC_WHTSP_IGNOREDIFFS2,"Button",BS_AUTORADIOBUTTON,129,19,58,10 + CONTROL "I&gnore all",IDC_WHTSP_IGNOREALL2,"Button",BS_AUTORADIOBUTTON,194,19,47,10 + CONTROL "Include i&ntegrations if using changelist numbers",IDC_INCLUDEINTEGS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,33,219,13 + CONTROL "Time Lapse &View includes integrations ",IDC_INCLUDEINTEGSTLV, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,55,219,13 END IDD_MOVEFILES DIALOGEX 0, 0, 148, 63 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Move File to Changelist" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "&Move to change:",IDC_ADDPROMPT,7,7,80,10 - COMBOBOX IDC_ADDCHANGNUM,7,20,135,63,CBS_DROPDOWNLIST | CBS_SORT | - CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADDCHANGNUM,7,20,135,63,CBS_DROPDOWNLIST | CBS_SORT | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,36,42,50,14 PUSHBUTTON "Cancel",IDCANCEL,91,42,50,14 END IDD_FIRSTTIMEDLG DIALOGEX 0, 0, 188, 108 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "View Getting Started?" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Yes",IDOK,77,87,50,14 PUSHBUTTON "&No",IDCANCEL,131,87,50,14 - LTEXT "Would you like to view the ""Getting Started with P4Win"" manual?", - IDC_STATIC,7,7,174,19 - LTEXT "Note: this manual requires Adobe® Acrobat Reader® whcih you can get by clicking this button:", - IDC_STATIC,7,31,114,30 + LTEXT "Would you like to view the ""Getting Started with P4Win"" manual?",IDC_STATIC,7,7,174,19 + LTEXT "Note: this manual requires Adobe® Acrobat Reader® whcih you can get by clicking this button:",IDC_STATIC,7,31,114,30 PUSHBUTTON "Get &Adobe",IDC_GETADOBE,131,33,50,21,BS_BITMAP - LTEXT "If you already have Acrobat Reader® installed, you can just click the Yes button.", - IDC_STATIC,7,63,174,20 + LTEXT "If you already have Acrobat Reader® installed, you can just click the Yes button.",IDC_STATIC,7,63,174,20 END IDD_FILTERBYOWNER DIALOGEX 0, 0, 139, 69 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Filter by Owner" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Current &user",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,7,125,10 + CONTROL "Current &user",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,7,125,10 CONTROL "",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,7,23,12,8 EDITTEXT IDC_OWNER,19,21,50,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,82,20,50,14 - CONTROL "Include labels with &no owner",IDC_INCBLANK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,36,125,10 + CONTROL "Include labels with &no owner",IDC_INCBLANK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,125,10 DEFPUSHBUTTON "OK",IDOK,19,48,50,14 PUSHBUTTON "Cancel",IDCANCEL,82,48,50,14 END IDD_DIFF2OBJS DIALOGEX 0, 0, 225, 76 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Diff 2" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -3141,64 +2554,50 @@ BEGIN END IDD_CLIENTFILTER DIALOGEX 0, 0, 255, 89 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Filter Clients" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "by &Owner",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,10,47,10 - CONTROL "Current &user",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,58,10,60,10 + CONTROL "by &Owner",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,10,47,10 + CONTROL "Current &user",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,10,60,10 CONTROL "",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,126,10,9,10 EDITTEXT IDC_OWNER,137,7,58,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse...",IDC_BROWSE,198,7,50,14 - CONTROL "by &Host",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,30,40,10 - CONTROL "&My host",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,58,30,60,10 + CONTROL "by &Host",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,40,10 + CONTROL "&My host",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,30,60,10 CONTROL "",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,125,30,9,10 EDITTEXT IDC_HOST,137,28,111,14,ES_AUTOHSCROLL - CONTROL "if &Description contains",IDC_CHECK3,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,50,94,10 + CONTROL "if &Description contains",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,94,10 EDITTEXT IDC_DESCCONTAINS,137,49,111,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,137,68,50,14 PUSHBUTTON "Cancel",IDCANCEL,198,68,50,14 END IDD_DIFF2OUTPUT DIALOGEX 0, 0, 314, 216 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Diff2 Output" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | - WS_BORDER | WS_TABSTOP,7,7,300,182 + CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,300,182 PUSHBUTTON "&Single Pane View",ID_SINGLEPANEVIEW,7,195,70,14 DEFPUSHBUTTON "&Diff",ID_DIFF2,202,195,50,14 PUSHBUTTON "Close",IDCANCEL,257,195,50,14 END IDD_BOOKMARKADD DIALOGEX 0, 0, 235, 167 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Bookmark" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Name:",IDC_LABEL_TEXT,7,9,26,8 EDITTEXT IDC_EDIT,34,7,194,14,ES_AUTOHSCROLL LTEXT "Menu item is a",IDC_STATIC_TITLE,38,22,57,8 - CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,100,22,56,10 - CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,159,22,45,10 + CONTROL "&Command",IDC_COMMAND,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,100,22,56,10 + CONTROL "&Submenu",IDC_SUBMENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,159,22,45,10 GROUPBOX "When this bookmark is chosen",IDC_STATIC,7,32,221,89 - CONTROL "&Find the path in current depot",IDC_RADIO1,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,43,205,10 - CONTROL "S&witch to the following before finding the path:", - IDC_RADIO2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12, - 55,204,10 + CONTROL "&Find the path in current depot",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,43,205,10 + CONTROL "S&witch to the following before finding the path:",IDC_RADIO2, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,55,204,10 LTEXT "&Port:",IDC_STATIC,25,70,26,8 EDITTEXT IDC_PORT,53,67,165,14,ES_AUTOHSCROLL LTEXT "C&lient:",IDC_STATIC,25,88,26,8 @@ -3212,17 +2611,14 @@ BEGIN END IDD_DELETEFIXES DIALOGEX 0, 0, 314, 191 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | - WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Delete Fixes from Changelist" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CTEXT "This is used to calculate the dimensions of the CReviewList listbox", - IDC_LISTRECT,7,7,300,142,SS_CENTERIMAGE | NOT WS_VISIBLE + CTEXT "This is used to calculate the dimensions of the CReviewList listbox",IDC_LISTRECT,7,7,300,142,SS_CENTERIMAGE | NOT WS_VISIBLE PUSHBUTTON "&Describe Job",IDC_DESCRIPTION,8,153,65,14 LTEXT "&Status:",IDC_JOBSTATUSPROMPT,7,172,33,11 - COMBOBOX IDC_JOBSTATUS,41,171,102,120,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_JOBSTATUS,41,171,102,120,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,148,170,50,14 PUSHBUTTON "Cancel",IDCANCEL,202,170,50,14 PUSHBUTTON "Help",ID_HELP,257,170,50,14 @@ -3235,8 +2631,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION RESOURCE_VERSION - PRODUCTVERSION RESOURCE_VERSION + FILEVERSION 2008,1,1,0 + PRODUCTVERSION 2008,1,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -3254,12 +2650,12 @@ BEGIN VALUE "Comments", "Requires Perforce 98.2.7488 or higher server" VALUE "CompanyName", "Perforce Software" VALUE "FileDescription", "Perforce Windows Client, English (U.S.) resource dll" - VALUE "FileVersion", RESOURCE_VERSION_STRING + VALUE "FileVersion", "2008,1,1,0" VALUE "InternalName", "P4Win409" - VALUE "LegalCopyright", "Copyright © 1997, 2008 Perforce Software" + VALUE "LegalCopyright", "Copyright © 1997, 2008 Perforce Software" VALUE "OriginalFilename", "P4Win409.DLL" VALUE "ProductName", "Perforce Windows GUI Client " - VALUE "ProductVersion", RESOURCE_VERSION_STRING + VALUE "ProductVersion", "2008,1,1,0" END END BLOCK "VarFileInfo" @@ -3275,7 +2671,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_HISTORY, DIALOG BEGIN @@ -3887,12 +3283,23 @@ END #endif // APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// AFX_DIALOG_LAYOUT +// + +IDD_PAGE_JOBS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + ///////////////////////////////////////////////////////////////////////////// // // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDR_MAINFRAME "Perforce\n\nPerforce\nPerforce Files (*.p4w)\n.P4W\nPerforce.Document\nPerforce Document" IDS_BAD_REGISTRY "Unable to write to registry.\nVerify that you have sufficient privileges." @@ -3911,7 +3318,7 @@ BEGIN IDS_CLEARFILTER "&Clear Filter" END -STRINGTABLE +STRINGTABLE BEGIN IDS_n_WERE_ADDED " (including %1!d! that were added)" IDS_NOTUNICODE "8-Bit " @@ -3937,7 +3344,7 @@ BEGIN IDS__WIZARD " Wizard" END -STRINGTABLE +STRINGTABLE BEGIN IDS_EDITSPEC_s "&Edit Spec %1!s!..." IDS_DESCRIBEIT_s "Descri&be %1!s!..." @@ -3963,14 +3370,14 @@ BEGIN "Could not restore data to format matching original spec" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_APP_TITLE "P4Win" AFX_IDS_IDLEMESSAGE "For Help, press F1" AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help" END -STRINGTABLE +STRINGTABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -3980,12 +3387,12 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE +STRINGTABLE BEGIN ID_CURRENTTASK " " END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_NEW "Create a new document\nNew" ID_FILE_OPEN "Open an existing document\nOpen" @@ -3998,7 +3405,7 @@ BEGIN ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" END -STRINGTABLE +STRINGTABLE BEGIN ID_APP_ABOUT "Display program information, version number and copyright\nAbout" ID_APP_EXIT "Quit the application\nExit" @@ -4009,7 +3416,7 @@ BEGIN ID_HELP "Display help for current task or command\nHelp" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_MV2OTHERCHGLIST "Move the selected files from their current changelist to another of your changelists\nMove Files to another Changelist" ID_HELP_GETTINGSTARTEDWITHP4WIN @@ -4018,7 +3425,7 @@ BEGIN ID_FILE_ANNOTATECHGALL "Prints all lines of all revisions for a file, indicating what changelist introduced each line" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_MRU_FILE1 "Open this document" ID_FILE_MRU_FILE2 "Open this document" @@ -4038,18 +3445,18 @@ BEGIN ID_FILE_MRU_FILE16 "Open this document" END -STRINGTABLE +STRINGTABLE BEGIN ID_NEXT_PANE "Switch to the next pane\nNext Pane" ID_PREV_PANE "Switch back to the previous pane\nPrevious Pane" END -STRINGTABLE +STRINGTABLE BEGIN ID_WINDOW_SPLIT "Split the active window into panes\nSplit" END -STRINGTABLE +STRINGTABLE BEGIN ID_EDIT_CLEAR "Erase the selection\nErase" ID_EDIT_CLEAR_ALL "Erase everything\nErase All" @@ -4064,7 +3471,7 @@ BEGIN ID_EDIT_REDO "Redo the previously undone action\nRedo" END -STRINGTABLE +STRINGTABLE BEGIN ID_SELECTFILES_CHANGED "Select all changed files in the changelist\nSelect Changed" ID_SELECTFILES_UNCHANGED @@ -4073,13 +3480,13 @@ BEGIN ID_LABEL_DIFF2 "Diff the files in 2 Labels\nDiff Files in 2 Labels" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCSIZE "Change the window size" AFX_IDS_SCMOVE "Change the window position" @@ -4098,13 +3505,13 @@ BEGIN IDS_BKMKSDLG_READ_BKMKS_TITLE "Read Bookmarks from a File" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCRESTORE "Restore the window to normal size" AFX_IDS_SCTASKLIST "Activate Task List" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" IDS_DRAGFROMDELTA "Internal drag from Delta Tree" @@ -4114,13 +3521,13 @@ BEGIN IDS_THEIRFILE_PROPERTIES "&Properties for Their file..." END -STRINGTABLE +STRINGTABLE BEGIN ID_PERFORCE_INFO "Show connection information in the status pane\nShow Connection Info" ID_PERFORCE_OPTIONS "Set Perforce options\nSet Perforce Options" END -STRINGTABLE +STRINGTABLE BEGIN ID_WINDOW_COPYALL "Copy entire contents of status pane to clipboard" ID_WINDOW_COPYSELECTED "Copy selected rows from status pane to clipboard" @@ -4140,7 +3547,7 @@ BEGIN ID_MRU_PCU8 "Switch to this Port, Client and User\nSwitch to this Port, Client and User" END -STRINGTABLE +STRINGTABLE BEGIN ID_MRU_PCU9 "Switch to this Port, Client and User\nSwitch to this Port, Client and User" ID_WINEXPLORE "Run the Windows Explorer in the directory containing the selected file" @@ -4154,7 +3561,7 @@ BEGIN ID_CHANGE_DESCRIBE_2 "Describe changelist\nDescribe Changelist" END -STRINGTABLE +STRINGTABLE BEGIN ID_BRANCH_NEW "Create new branch specification\nNew BranchSpec" ID_BRANCH_EDITSPEC "Edit branch specification\nEdit BranchSpec" @@ -4165,7 +3572,7 @@ BEGIN ID_LABEL_NEW "Create new label\nNew Label" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_OPENEDIT "Open file(s) for edit\nOpen for edit" ID_FILE_OPENDELETE "Open file(s) for delete\nOpen for delete" @@ -4179,13 +3586,13 @@ BEGIN ID_FILE_OPENEDITA "Open file(s) for add\nOpen for add" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_DIFFHEAD "Diff client file against Depot file\nDiff vs Depot File" ID_FILE_REVISIONHISTORY "Show revision history\nShow rev history" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_QUICKBROWSE "View file using associated viewer\nView File" ID_FILE_AUTOBROWSE "View file\nView File" @@ -4197,7 +3604,7 @@ BEGIN ID_FILE_REFRESHFROMDEPOT "Refresh " END -STRINGTABLE +STRINGTABLE BEGIN ID_CHANGE_NEW "Create new changelist\nNew Changelist" ID_CHANGE_EDSPEC "Edit changelist\nEdit Changelist" @@ -4208,7 +3615,7 @@ BEGIN ID_CHANGE_ADDJOBFIX "Attach a job which is fixed by this changelist\nAdd Job Fix..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_PAGE_LABEL "Labels" IDS_PAGE_MERGE "Merge" @@ -4222,7 +3629,7 @@ BEGIN IDS_PAGE_AUTORESOLVE "Resolve" END -STRINGTABLE +STRINGTABLE BEGIN ID_LABEL_EDIT_SPEC "Edit label specification\nEdit Label Spec" ID_LABEL_DELETE "Delete Perforce label\nDelete Label" @@ -4230,7 +3637,7 @@ BEGIN ID_LABEL_SYNC_CLIENT "Synchronize client files to match label - will Get Files as Required\nSync client" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILTERBYOWNER "Show only the Labels owned by given user" ID_CLEAROWNERFILTER "Show labels owned by all users" @@ -4239,7 +3646,7 @@ BEGIN ID_FILE_ANNOTATIONS "View changes to the file over time" END -STRINGTABLE +STRINGTABLE BEGIN ID_CLIENT_EDITMY "Edit the current client specification\nEdit current client spec" ID_CLIENT_TEMPLATE "Create or update Perforce client using selected client as a template\nCreate/Update from template" @@ -4254,7 +3661,7 @@ BEGIN ID_USER_DELETE "Delete user\nDelete user" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_UPDATE "Refresh or update depot pane\nRefresh" ID_WINDOW_CLEAR "Clear contents of this pane\nClear Pane" @@ -4265,7 +3672,7 @@ BEGIN ID_LABEL_DESCRIBE "Describe label\nDescribe label" END -STRINGTABLE +STRINGTABLE BEGIN ID_LABEL_DELETEFILES "Delete some of the files Listed in Label\nDelete Some files Listed in Label" ID_LABELFILTER_CLEARVIEW "Show all the Labels\nClear Filter" @@ -4286,7 +3693,7 @@ BEGIN ID_FINDPREV "Repeat the last Find, but in the opposite direction\nFind Previous" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_CLIENTVIEW "Show only the depot files that are in client view\nClient View Only." ID_VIEW_LOCAL_P4 "View local files under the client's root that are in Perforce\nLocal view of Perforce files" @@ -4304,13 +3711,13 @@ BEGIN ID_JOB_REMOVEFILEFILTER "Clear the Jobs file filter\nClear Jobs File Filter" END -STRINGTABLE +STRINGTABLE BEGIN ID_JOB_SETFILEFILTERINTEG "Filter Job pane to show jobs fixed by files currently selected in Depot pane, include integrations into these files" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_REFRESH "Refresh files from depot\nRefresh Files" ID_CHANGE_REMOVEFIX "Remove (unfix) job from changelist\nRemove Fix" @@ -4319,7 +3726,7 @@ BEGIN ID_FILEREVISION_DIFF2 "Diff two selected revisions of file\nDiff Two" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_ADD "Add file(s) to source control\nAdd Files" ID_FILE_PROPERTIES "Display File Information\nFile Information" @@ -4329,7 +3736,7 @@ BEGIN ID_FILEDROP_DELETE "Open files for delete" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILEDROP_CANCEL "Cancel drag-drop operation" ID_FILE_QUICKEDIT "Checkout and edit file using associated viewer\nEdit File" @@ -4343,7 +3750,7 @@ BEGIN ID_SUBMITTED_ACTIVATE "View submitted changelists pane\nView Submitted Changelists" END -STRINGTABLE +STRINGTABLE BEGIN ID_USER_ACTIVATE "View users\nView Users" ID_FILTER_CLEAR "Clear change listing filter\nClear Filter" @@ -4353,7 +3760,7 @@ BEGIN ID_FILE_INTEGSPEC "Integrate files without branch\nIntegrate by Filespec" END -STRINGTABLE +STRINGTABLE BEGIN ID_USER_CREATENEWUSER "Create a new User\nNew User" ID_USER_SWITCHTOUSER "Change your current user to another.\nSwitch to another user" @@ -4365,13 +3772,13 @@ BEGIN ID_FILE_RECOVER "Recover deleted file using the revision currently on the Client or the using next to last revision if no revision on Client\nRecover Deleted File" END -STRINGTABLE +STRINGTABLE BEGIN ID_CLIENTSPEC_NEW "Create a new client specification\nNew Client" ID_CLIENTSPEC_SWITCH "Use the selected client to map the Perforce depot to your computer\nSwitch Client" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ASSOCEDITOR "Associated &Editor" IDS_ASSOCVIEWER "Associated &Viewer" @@ -4391,7 +3798,7 @@ BEGIN IDS_INTEGMODEPRE991 "PERFORCE has a very flexible branching and integration model, allowing many options. This wizard is here to explain those options and assist you in making your integration experience enjoyable.\r\n\r\nThe selected file(s) are integration targets, and will be opened for integration to allow them to be updated to reflect revisions made in other files. (Use of a file selection set as source files for an integration requires a 99.1 or newer PERFORCE server)\r\n\r\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INTEGFILESPECBRANCH "The files involved in an integration are restricted in two ways:\r\nA) they must be included in the branch view\r\nB) they must be included in the source or target filespec\r\n\r\n\r\nAdvanced users may wish to edit the filespecs to further restrict the integration operation." IDS_ADDJOBFIX "&Add Job Fix..." @@ -4411,7 +3818,7 @@ BEGIN IDS_REVISIONHISTORY "Revision &History..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SHOWDELITEMS "Show Deleted Items" IDS_SYNCTOHEAD "&Sync to Head Revision\tCtrl+Y" @@ -4431,7 +3838,7 @@ BEGIN IDS_VWCLIVWOFDEPOT "&Client View of Depot" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PERFORCE_FILTERED_LABELS_BY_OWNER "Perforce Labels (filtered by Owner)" @@ -4454,7 +3861,7 @@ BEGIN IDS_n_WOULD_BE_ADDED " (including %1!d! that would be added)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_VWENTIREDEPOT "&Entire Depot" IDS_CANCEL "Cancel" @@ -4474,7 +3881,7 @@ BEGIN IDS_DIFFFILESAGAINSTDEPOT "&Diff Files Against Depot" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PATH_NOT_FOUND "The system cannot find the path specified" IDS_SETDEFCLIENT_s "Set Defa&ult Client to %1!s!" @@ -4494,7 +3901,7 @@ BEGIN IDS_SYNCTOREV "&Sync to selected revision" END -STRINGTABLE +STRINGTABLE BEGIN ID_SHOWDELETEDFILES "Toggle the displaying of files that have been marked for deletion at their head revision" ID_POSITIONDEPOT "Find the selected file in the depot" @@ -4515,12 +3922,12 @@ BEGIN ID_VIEW_CLEARFILTER "Clear the Depot pane filter\nClear Filter" END -STRINGTABLE +STRINGTABLE BEGIN ID_CLEARFILTER "Clear the Depot filter" END -STRINGTABLE +STRINGTABLE BEGIN ID_JOB_CONFIGURE "Configure what fields from the JobSpec are shown in the Job Pane\nSet job list columns" ID_IMPORT "Import a text file of P4Win Tools" @@ -4536,7 +3943,7 @@ BEGIN ID_BOOKMARKS "Add and organize bookmarks, Go to a bookmarked location in the depot\nBookmarks" END -STRINGTABLE +STRINGTABLE BEGIN IDS_JOB_CONFIGURE "&Set job list columns..." IDS_SORTCHGSBYUSER "S&ort Changelists by User" @@ -4558,7 +3965,7 @@ BEGIN IDS_TAB_ALT_PLUS_n " Alt+%1!d!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILTER_JOBVIEW "F&ilter by Selected Files" IDS_JOB_REMOVEFILEFILTER "C&lear File Filter" @@ -4584,7 +3991,7 @@ BEGIN IDS_ALREADY_FAVORITE " is already in your Connections list - it will be replaced unless you change the port, client or user" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ADD_BOOKMARK "Add &Bookmark" IDS_THERE_IS_NO_s_TO_DESCRIBE "There is no %1!s! to describe" @@ -4610,7 +4017,7 @@ BEGIN IDS_PERFORCE_FILTERED_LABELS "Perforce Labels (filtered by Files)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_P4WIN "P4Win" IDS_P4WIN_WARNING "P4Win Warning" @@ -4618,7 +4025,7 @@ BEGIN IDS_FOUND_ONE_FILE_FOR_ADD "Found one file for Add" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOUND_n_FILES_FOR_ADD "Found %1!d! files for Add" IDS_THIS_FILE_ADD_OPERATION_HAS_ALREADY_FOUND_OVER_n @@ -4642,7 +4049,7 @@ BEGIN IDS_ROOT "Root" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SWITCH_TO_s "&Switch to %1!s!" IDS_CLIENT_s_IS_LOCKED_BY_USER_s_AND_CANT_BE_USED_BY_s @@ -4666,7 +4073,7 @@ BEGIN IDS_REVERTING_FILES "Reverting files..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_NO_FILES_WILL_BE_REVERTED_BECAUSE "No files will be reverted because all files\n1) have been changed or deleted or\n2) are new (ADD or BRANCH) files" @@ -4688,7 +4095,7 @@ BEGIN IDS_ENUMERATING_FILES "Enumerating files.." END -STRINGTABLE +STRINGTABLE BEGIN IDS_CAPTIONADDSEVERALFILES_n "Open %1!d! files for Add or Edit or Delete" IDS_DEFAULTCHANGELISTNAME " Default" @@ -4712,7 +4119,7 @@ BEGIN "Client file %1!s! does not differ from the depot version" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNABLE_TO_DRAG_JOBS_BETWEEN_CHANGES "Unable to drag jobs between changes\n - Jobs will not be moved." @@ -4736,7 +4143,7 @@ BEGIN IDS_REQUESTING_HISTORY "Requesting history..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_FETCHING_JOB_SPEC "Retrieving job spec..." IDS_NO_JOBS_AVAILABLE_FOR_FIXING @@ -4758,7 +4165,7 @@ BEGIN IDS_TO_TYPE_XTEXT "to type &xtext" END -STRINGTABLE +STRINGTABLE BEGIN IDS_TO_TYPE_CTEXT "to type &ctext" IDS_TO_TYPE_CXTEXT "to type cxte&xt" @@ -4782,7 +4189,7 @@ BEGIN "Sync would remove no files from client" END -STRINGTABLE +STRINGTABLE BEGIN IDS_THERE_WERE_WARNINGS_REPORTED_DURING_THE_SYNC "There were warnings reported during the Sync\n\nDo you want to continue with the Integration?" @@ -4810,7 +4217,7 @@ BEGIN IDS_REQUEST_OPEN_EDIT "Request open-edit..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNABLE_TO_RECOVER_FILE_s "Unable to recover file %1!s!." IDS_n_OF_n_SELECTED_FILES_CANNOT_BE_RECOVERED @@ -4836,7 +4243,7 @@ BEGIN IDS_FILE_RENAME "File Rename" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILE_INTEGRATE "File Integrate" IDS_P4DIFF_ERROR "P4Diff Error" @@ -4862,7 +4269,7 @@ BEGIN "File Integrate using Branchspec %1!s!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_OK "OK" IDS_TARGET_FILESPEC_MUST_END_IN_WILDCARD @@ -4885,7 +4292,7 @@ BEGIN "You have entered the all-encompassing filespec '//...'\nIf there are files that are included as both source and target, a bidirectional integrate will occur.\n\nDo you wish to proceed?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DIFFING_FILES "Diff'ing Files" IDS_CHANGELIST "Changelist" @@ -4906,7 +4313,7 @@ BEGIN "&Add/Replace Files Listed in Label %1!s!..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SYNCHRONIZING_LABEL_s_TO_THE_CLIENT_WILL "Synchronizing label '%1!s!' to the client will make the\nlabel reflect the set of files in the label's view,\nat the revision that presently exists on the client\n\nProceed with sync?" @@ -4929,7 +4336,7 @@ BEGIN IDS_AmpEDIT_s "&Edit %1!s!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_PERFORCE_PORT_s_CLIENT_s_USER_s "%1!s! %2!s! %3!s! - Perforce P4Win" IDS_PORT_s "Port: %1!s!" @@ -4944,8 +4351,6 @@ BEGIN "User Name: %1!s!\r\nClient Name: %2!s!\r\nClient Host: %3!s!\r\nClient Root: %4!s!\r\nClient Address: %5!s!\r\nClient Version: %6!s!\r\nClient P4Charset: %12!s!\r\nClient Ansi Code Page: %13!s!\r\n\r\nServer Address: %7!s!\r\nServer Version: %8!s!\r\nServer License: %9!s!\r\nServer Root: %10!s!\r\nClient OS: %11!s!\rUnicode Enabled: %14!s!\r\n" IDS_USERCLIENTROOTADDRVERSERVERADDRDATEVERLICENSEROOTOS "User Name: %1!s!\r\nClient Name: %2!s!\r\nClient Host: %3!s!\r\nClient Root: %4!s!\r\nClient Address: %5!s!\r\nClient Version: %6!s!\r\nClient P4Charset: %13!s!\r\nClient Ansi Code Page: %14!s!\r\n\r\nServer Address: %7!s!\r\nServer Date: %8!s!\r\nServer Version: %9!s!\r\nServer License: %10!s!\r\nServer Root: %11!s!\r\nClient OS: %12!s!\rUnicode Enabled: %15!s!\r\n" - IDS_USERCLIENTROOTCWDADDRVERSERVERADDRDATEVERLICENSEROOTOS - "User Name: %1!s!\r\nClient Name: %2!s!\r\nClient Host: %3!s!\r\nClient Root: %4!s!\r\nCurrent Dir: %5!s!\r\nClient Address: %6!s!\r\nClient Version: %7!s!\r\nClient P4Charset: %14!s!\r\nClient Ansi Code Page: %15!s!\r\n\r\nServer Address: %8!s!\r\nServer Date: %9!s!\r\nServer Version: %10!s!\r\nServer License: %11!s!\r\nServer Root: %12!s!\r\nClient OS: %13!s!\rUnicode Enabled: %16!s!\r\n" IDS_PENDING_PERFORCE_CHANGELISTS "Pending Perforce Changelists" IDS_PERFORCE_LABELS "Perforce Labels" IDS_PERFORCE_BRANCHES "Perforce Branches" @@ -4954,7 +4359,20 @@ BEGIN IDS_ADD_FILES_TO_SOURCE_CONTROL "Add File(s) to Source Control" END -STRINGTABLE +STRINGTABLE +BEGIN + IDS_USER_s_ALREADY_EXIST + "A User named %1!s! already exists; you cannot create a new one with that name." + IDS_USER_s_DIFFCASE_EXIST + "A User already exists that differs only by case.\n\nDo you still want to create %1!s!?" + IDS_FAILEDREGWRITE "Updating Registry Failed: %1!s!" + IDS_INSERTING_CLIENTS "Inserting %1!d! clients..." + IDS_INSERTING_LABELS "Inserting %1!d! labels..." + IDS_USERCLIENTROOTCWDADDRVERSERVERADDRDATEVERLICENSEROOTOS + "User Name: %1!s!\r\nClient Name: %2!s!\r\nClient Host: %3!s!\r\nClient Root: %4!s!\r\nCurrent Dir: %5!s!\r\nClient Address: %6!s!\r\nClient Version: %7!s!\r\nClient P4Charset: %14!s!\r\nClient Ansi Code Page: %15!s!\r\n\r\nServer Address: %8!s!\r\nServer Date: %9!s!\r\nServer Version: %10!s!\r\nServer License: %11!s!\r\nServer Root: %12!s!\r\nClient OS: %13!s!\rUnicode Enabled: %16!s!\r\n" +END + +STRINGTABLE BEGIN IDS_CUSTOM_FILTER_s "Custom Filter (%1!s!)" IDS_EXTENDED_ERROR_n_IN_FILEDIALOG "File selection dialog box error %1!d!" @@ -4979,7 +4397,7 @@ BEGIN IDS_VERIFYING_HEAD_CHANGELIST "Verifying head changelist..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_REQUESTING_CHANGES "Requesting changes..." IDS_PLEASE_SELECT_A_CHANGELIST "Please select a changelist." @@ -5002,7 +4420,7 @@ BEGIN "Password must contain only ASCII characters." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SPEC_UNABLE_TO_START_P4_s_s "Unable to start p4 %1!s!: %2!s!" IDS_MISSING_APPNAME_s_s "No %1!s! specified.\nUse Perforce-Options Dialog to specify a %2!s!." @@ -5023,7 +4441,7 @@ BEGIN IDS_SPECDESC_PAGESETUP "Page Set&up..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_NEW_PASSWORD_DOES_NOT_MATCH_CONFIRMATION_PASSWORD "New password does not match confirmation password." @@ -5051,7 +4469,7 @@ BEGIN IDS_FULL_NAME "Full Name" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ACCESS "Access" IDS_NUMBER_OF_USERS_n "Number of users: %1!d! " @@ -5077,7 +4495,7 @@ BEGIN "Field '%1!s!' can have only %2!d! words per line." END -STRINGTABLE +STRINGTABLE BEGIN IDS_FIELD_s_CAN_HAVE_ONLY_ONE_WORD_PER_LINE "Field '%1!s!' can have only one word per line." @@ -5104,7 +4522,7 @@ BEGIN IDS_REVERTED_n_FILES "Reverted %1!d! files" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOCKED_n_FILES "Locked %1!d! files" IDS_UNLOCKED_n_FILES "Unlocked %1!d! files" @@ -5131,7 +4549,7 @@ BEGIN IDS_comma_RCS_DELTAS_STORED ", RCS deltas stored" END -STRINGTABLE +STRINGTABLE BEGIN IDS_comma_FULL_FILE_STORED_PER_REV ", full file stored per rev" IDS_comma_ONLY_HEAD_REV_STORED ", only head rev stored" @@ -5143,7 +4561,7 @@ BEGIN "One or more files have been opened by other users. Do you want to open all selected files anyway?" IDS_comma_LIMITED_RCS_KEYWORD_EXPANSION ", limited RCS keyword expansion" IDS_amp_Copy_tab_Ctrl_C "&Copy\tCtrl+C" - IDS_A_SUBMENU " »" + IDS_A_SUBMENU " »" IDS_CHANGE "Change " IDS_OWNER "Owner" IDS_HOST "Host" @@ -5152,7 +4570,7 @@ BEGIN IDS_CAPTIONADDONEFILE "Open for Add or Edit or Delete" END -STRINGTABLE +STRINGTABLE BEGIN IDS_INVALID_USER_s "This User is invalid and cannot be used in P4Win:\n%1!s!" IDS_NO_FILES_UNDER_FOLDER "No files under this folder." @@ -5176,7 +4594,7 @@ BEGIN "\nAll target files must either not exist in the depot or have been deleted.\n\nThe following file(s) are not suitable as rename targets:" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILE_SPECIFICATIONS__RENAME__NEW_NAMES "New Name(s)" IDS_TOO_MANYFILES_TO_ADD @@ -5201,12 +4619,12 @@ BEGIN IDS_COMBO_DATE "Date" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ABOUTCAPTION "About P4Win" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STAR_LOCKED "*locked*" IDS_PLUS_UNKNOWN " + unknown" @@ -5229,7 +4647,7 @@ BEGIN "Error opening temporary file - Disk Full:\n %1!s!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ADD_FILES_TO_CLIENT_s_VIEW "Add Files to Client %1!s! &View..." IDS_ADD_FILES_TO_USER_s_REVIEWS "Add Files to User %1!s! &Reviews..." @@ -5254,7 +4672,7 @@ BEGIN IDS_ACTION "Action?" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNABLE_TO_OPEN_TRY_AGAIN "Unable to Open files at this time - please try again" @@ -5278,7 +4696,7 @@ BEGIN "%1!s!#%2!d! <%3!s!> Changelist %4!05d! <%5!s!>\n" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LABEL_s_TO_s_n_s_CHANGELIST_n_s "Label %1!s! --> %2!s!#%3!d! <%4!s!> Changelist %5!05d! <%6!s!>" @@ -5307,7 +4725,7 @@ BEGIN """Tools > %1!s!"" requires that only one file be selected" END -STRINGTABLE +STRINGTABLE BEGIN IDS_TOOLS_ERROR_n_CANNOT_RUN_s_s "Error: %1!d! - Unable to run %2!s!\n%3!s!" @@ -5329,7 +4747,7 @@ BEGIN IDS_FSTAT_s_n "%1!s!#%2!ld!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LOADING_DIFFS "Loading Diffs..." IDS_UNABLE_TO_DETERMINE_REV_NUMBERS_DIFF_FAILS @@ -5355,7 +4773,7 @@ BEGIN IDS_SPECDESC_QUICKHELP "Select a changelist number, file name, job name, e-mail address, etc. and then right-click for a list of operations you can perform on that object." END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHANGE_s_n_s "%1!s! - Change %2!5ld! {%3!s!}" IDS_CHANGE_s_n_s_TRUNC "%1!s! - Change %2!5ld! {%3!s!...}" @@ -5381,7 +4799,7 @@ BEGIN IDS_TOOLARGS_TITLE "Add Filename to Arguments" END -STRINGTABLE +STRINGTABLE BEGIN IDS_STATUS_TOOL "TOOL: " IDS_STATUS_DEBUG "DEBUG: " @@ -5403,7 +4821,7 @@ BEGIN IDS_CHANGE_USER_s_n "%1!s! - Change %2!5d!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNKNOWN "" IDS_NO_SUBDIR_UNDER_FOLDER "No subdirectories under this folder." @@ -5431,7 +4849,7 @@ BEGIN "Unable to find file on client: %1!s!\n Use File-Revert to force a refresh of the file, and then re-try the edit operation for this file." END -STRINGTABLE +STRINGTABLE BEGIN IDS_REMOTE_DOWN_TURNING_OFF_INTEGS "A remote depot is not available - turning off complete branching history" @@ -5456,7 +4874,7 @@ BEGIN IDS_EDITFILE "Edit &File..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_OPENANDEDITFILE "Open and Edit &File..." IDS_CHKOUTFORADD "Op&en for Add" @@ -5477,7 +4895,7 @@ BEGIN IDS_FILE_ADD "&Add to Source Control..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SUBMIT_SELECTED "&Submit Selected" IDS_FILTERED_BY_USER "Filtered Sub&mitted Changelists by User" @@ -5500,7 +4918,7 @@ BEGIN IDS_PSWD_FORGOTTEN "Your password will now no longer be remembered." END -STRINGTABLE +STRINGTABLE BEGIN IDS_OLD_NEW_PSWD_SAME "Old and New passwords are the same - nothing to be done." IDS_NOLOCALFORNULLROOT "Unable to display local view for clients with a 'null' root or a root without a drive letter." @@ -5522,7 +4940,7 @@ BEGIN IDS_FILE_RENAME_TITLE "File Rename" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_DIFF2 "Diff selected 2 files/folders or Diff different revisions of the same file\nDiff &2 Files or Revisions" ID_FAVORITES "Add and organize frequently used port/client/users, Go to a frequently used port/client/user\nConnections" @@ -5542,7 +4960,7 @@ BEGIN ID_CLEARFILTER_JOBS "Clear filtering of jobs view\nClear Filter" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SHIFT_ALT_PLUS_n " Shift+Alt+%1!d!" IDS_ADD_FAVORITE "Add Connection" @@ -5566,7 +4984,7 @@ BEGIN "Click on the down arrow for a choice of the type of Diff to run" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SUBMIT_DOTS "&Submit..." IDS_DEFAULTFONTNAME "Courier New" @@ -5584,13 +5002,13 @@ BEGIN IDS_CANTDIFF_s "Unable to diff %1!s! against the depot" END -STRINGTABLE +STRINGTABLE BEGIN - IDS_SE_ERR_NOASSOC "The ""Getting Started with P4Win"" manual is in PDF format and requires the Adobe® Acrobat Reader®.\n\nAfter downloading and install the Acrobat® Reader® from http://www.adobe.com/, try Help > Getting Started again" + IDS_SE_ERR_NOASSOC "The ""Getting Started with P4Win"" manual is in PDF format and requires the Adobe® Acrobat Reader®.\n\nAfter downloading and install the Acrobat® Reader® from http://www.adobe.com/, try Help > Getting Started again" IDS_SE_ERR_FNF "Cannot find %1!s!" IDS_SE_ERR_OTHER "Cannot open %1!s! - error code %2!d!" IDS_WWW_ADOBE "http://www.adobe.com/" - IDS_WAIT4ADOBE "After you have downloaded and installed Adobe® Acrobat Reader®, click the Yes button on the dialog." + IDS_WAIT4ADOBE "After you have downloaded and installed Adobe® Acrobat Reader®, click the Yes button on the dialog." IDS_FILE_NOT_FOUND_IN_CHGS "File not found in any changelist" IDS_FILE_FOUND_IN_CHG_d "File found in changelist %1!ld!" IDS_FILE_FOUND_IN_DEFCHG "File found in Default changelist" @@ -5605,7 +5023,7 @@ BEGIN IDS_DIFF_WARNLIMIT_EXCEEDED_d "Are you sure you want to Diff %1!d! files?" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_DEPOT "Set the depot view options\nView" ID_VIEW_UPDATE_RIGHT "Refresh or update active pane\nRefresh" @@ -5626,13 +5044,13 @@ BEGIN IDS_PAGE_JOB "Jobs" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_ANNOTATE "Prints all lines of a file, indicating what revision introduced each line" ID_FILE_ANNOTATEALL "Prints all lines of all revisions for a file, indicating what revision introduced each line" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NO_s_AVAILABLE "There are no %1!s! available to select." IDS_ACTIONLABEL "Actions in changelist %1!d!" @@ -5653,7 +5071,7 @@ BEGIN IDS_FILE_MV2OTHERCHGLIST "&Move to another Changelist..." END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_RUNMERGETOOL "Run the Merge Tool on the selected files\nRun Merge Tool" ID_THEIRFILE_FINDINDEPOT @@ -5664,7 +5082,7 @@ BEGIN IDS_RUNMERGETOOL "Run &Merge Tool...\tCtrl+M" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FINISH "Finish" IDS_NO_POUND_ALLOWED_s_s @@ -5690,7 +5108,7 @@ BEGIN "A Revision Range may not be used as part of the source or target specification; click the Options button to specify Revision Ranges." END -STRINGTABLE +STRINGTABLE BEGIN IDS_UNABLE_TO_WRITE_P4DEFAULT_TO_THE_REGISTRY "Cannot set default in registry, because settings from a config file or environment variable override registry settings. To enable P4Win to set the desired defaults, remove any config files in or above the folder where p4win.exe resides and unset any conflicting environment variables." @@ -5719,7 +5137,7 @@ BEGIN "You may enter only one file per line. The line\n%1!s!\nhas more than one file." END -STRINGTABLE +STRINGTABLE BEGIN IDS_CANNOT_RECREATE_ACTIVE_s_s_s "%1!s! is your current %2!s!; you cannot create a new %3!s! with that name." @@ -5741,7 +5159,7 @@ BEGIN IDS_FILTERBRANCHBYOWNER "Filter Branches by O&wner..." END -STRINGTABLE +STRINGTABLE BEGIN IDS_CLEARBRANCHOWNERFILTER "Clear Owner Filter" IDS_CLEARFILTERR "Clear Filte&r" @@ -5764,7 +5182,7 @@ BEGIN IDS_ALLJOBS "All Jobs" END -STRINGTABLE +STRINGTABLE BEGIN IDS_USEJOBFILTERBUTTON "Use the Filter button to change your job filter string in order to have jobs to add" IDS_CHKCONCANTHANDLEWEIRDCHARS @@ -5790,7 +5208,7 @@ BEGIN IDS_REMOVE_FIXES_FROM_CHGLIST_d "Remove Job Fixes from Changelist %1!d!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_COULD_NOT_CREATE_DELFIX_DIALOG_BOX "Failed to create the Remove Fixes dialog." @@ -5815,7 +5233,7 @@ BEGIN IDS_REVERTEDALL_n_FILES "Reverted all %1!d! unchanged files in changelist %2!s!" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DELETENEWUSER_s "%1!s! has been created on the server - do you want to delete it?" IDS_ANNOTATEFILE "Annotate File" @@ -5840,18 +5258,7 @@ BEGIN IDS_comma_ONLY_n_REVS_STORED ", only %1!d! revs stored" END -STRINGTABLE -BEGIN - IDS_USER_s_ALREADY_EXIST - "A User named %1!s! already exists; you cannot create a new one with that name." - IDS_USER_s_DIFFCASE_EXIST - "A User already exists that differs only by case.\n\nDo you still want to create %1!s!?" - IDS_FAILEDREGWRITE "Updating Registry Failed: %1!s!" - IDS_INSERTING_CLIENTS "Inserting %1!d! clients..." - IDS_INSERTING_LABELS "Inserting %1!d! labels..." -END - -#endif // English (U.S.) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Source/gui/P4Win409/P4Win409.vcxproj b/Source/gui/P4Win409/P4Win409.vcxproj index 78cfc41..3b85a95 100644 --- a/Source/gui/P4Win409/P4Win409.vcxproj +++ b/Source/gui/P4Win409/P4Win409.vcxproj @@ -22,6 +22,7 @@ DynamicLibrary Dynamic MultiByte + v142 diff --git a/Source/gui/SpecDescDlg.cpp b/Source/gui/SpecDescDlg.cpp index f8af704..bac6b26 100644 --- a/Source/gui/SpecDescDlg.cpp +++ b/Source/gui/SpecDescDlg.cpp @@ -534,7 +534,7 @@ BOOL CSpecDescDlg::OnInitDialog() GetMenu()->DeleteMenu(3, MF_BYPOSITION); } - if (m_ShowShowFixes) + if (m_ShowShowFixes && GET_P4REGPTR()->GetJobsEnabled()) { GetDlgItem(IDC_SHOWFIXES)->ShowWindow(SW_SHOWNORMAL); GetDlgItem(IDC_SHOWFIXES)->EnableWindow(TRUE); diff --git a/Source/gui/resource.h b/Source/gui/resource.h index 4a443f0..10019a8 100644 --- a/Source/gui/resource.h +++ b/Source/gui/resource.h @@ -1,17 +1,9 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by c:\workspac\main\p4-win\gui\P4Win409\P4Win409.rc +// Used by U:\Personal\Projects\P4Win\Source\gui\P4Win409\P4Win409.rc // -#define VERSION_MAJOR 2008 -#define VERSION_MINOR 1 -#define VERSION_PATCH 1 -#define VERSION_STRINGIFY(major, minor, patch) _T(#major) _T(".") _T(#minor) _T(".") _T(#patch) -#define VERSION_TOSTRING(major, minor, patch) VERSION_STRINGIFY(major,minor,patch) -#define VERSION_STRING VERSION_TOSTRING( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ) -#define RESOURCE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, 0 -#define RESOURCE_VERSION_STRINGIFY(major, minor, patch) #major "," #minor "," #patch ",0" -#define RESOURCE_VERSION_TOSTRING(major, minor, patch) RESOURCE_VERSION_STRINGIFY(major, minor, patch) -#define RESOURCE_VERSION_STRING RESOURCE_VERSION_TOSTRING( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ) +#define VERSION_MINOR 1 +#define VERSION_PATCH 1 #define IDC_NOT_USED 1 #define P4_INT_MINOR 1 #define IDC_NEXT 2 @@ -611,6 +603,7 @@ #define IDC_INTEGFORCE 1133 #define IDC_POLLJOBS 1133 #define IDC_INTEGREVERSE 1134 +#define IDC_ENABLEJOBS 1134 #define IDC_CHANGELIST 1135 #define IDC_EDITUSEVIEW 1135 #define IDC_INTEGPREVIEW 1136 @@ -1592,6 +1585,7 @@ #define IDS_USER_HAS_OPEN_FILES_CANT_DELETE 2005 #define IDS_CANT_DELETE_UNOWNED_BRANCH 2006 #define IDS_CANT_DELETE_PRIVELEGE_s 2007 +#define VERSION_MAJOR 2008 #define IDS_CANT_DELETE_UNOWNED_CLIENT 2008 #define IDS_CANT_DELETE_UNOWNED_LABEL 2009 #define IDS_SYNC_PREVIEW 2010 @@ -1821,7 +1815,7 @@ #define IDS_FAILEDREGWRITE 2226 #define IDS_INSERTING_CLIENTS 2227 #define IDS_INSERTING_LABELS 2228 -#define IDS_USERCLIENTROOTCWDADDRVERSERVERADDRDATEVERLICENSEROOTOS 2229 +#define IDS_USERCLIENTROOTCWDADDRVERSERVERADDRDATEVERLICENSEROOTOS 2229 #define P4_INT_LBUILD 6053 #define ID_PERFORCE_INFO 32771 #define ID_PERFORCE_OPTIONS 32772 @@ -2375,7 +2369,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 466 +#define _APS_NEXT_RESOURCE_VALUE 467 #define _APS_NEXT_COMMAND_VALUE 33160 #define _APS_NEXT_CONTROL_VALUE 1542 #define _APS_NEXT_SYMED_VALUE 368 From 95fb3766159076555eec861098f205691b3cb86c Mon Sep 17 00:00:00 2001 From: Daniel Jennings Date: Wed, 8 Jan 2020 11:32:04 -0800 Subject: [PATCH 12/12] Fix all of the pending changelists looking expandable if we don't run the Fixes code. --- Source/gui/DeltaTreeCtrl.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Source/gui/DeltaTreeCtrl.cpp b/Source/gui/DeltaTreeCtrl.cpp index baaaef7..1847a03 100644 --- a/Source/gui/DeltaTreeCtrl.cpp +++ b/Source/gui/DeltaTreeCtrl.cpp @@ -2270,6 +2270,18 @@ BOOL CDeltaTreeCtrl::ExpandTree( const HTREEITEM item ) MainFrame()->ClearStatus(); } } + else + { + // If we aren't running the fixes command, we need to manually + // fix up our expansion state (this normally happens downstream + // of the fixes command coming back.) + + SetLParam( item, FOLDER_ALREADY_EXPANDED); + if( GetChildItem( item ) == NULL ) + { + SetChildCount( item, 0 ); + } + } return TRUE; }