IncomingChangesTab.cs 24 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715
  1. using System;
  2. using System.Collections.Generic;
  3. using UnityEditor;
  4. using UnityEngine;
  5. using Codice.Client.BaseCommands;
  6. using Codice.Client.Commands;
  7. using Codice.Client.Common.FsNodeReaders;
  8. using Codice.CM.Common;
  9. using GluonGui;
  10. using PlasticGui;
  11. using PlasticGui.Gluon.WorkspaceWindow;
  12. using PlasticGui.Gluon.WorkspaceWindow.Views.IncomingChanges;
  13. using PlasticGui.WorkspaceWindow.Diff;
  14. using Unity.PlasticSCM.Editor.AssetUtils;
  15. using Unity.PlasticSCM.Editor.UI;
  16. using Unity.PlasticSCM.Editor.UI.Progress;
  17. using Unity.PlasticSCM.Editor.UI.Tree;
  18. using Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon.Errors;
  19. using Unity.PlasticSCM.Editor.Tool;
  20. namespace Unity.PlasticSCM.Editor.Views.IncomingChanges.Gluon
  21. {
  22. internal class IncomingChangesTab :
  23. IIncomingChangesTab,
  24. IRefreshableView,
  25. IncomingChangesViewLogic.IIncomingChangesView,
  26. IIncomingChangesViewMenuOperations,
  27. IncomingChangesViewMenu.IMetaMenuOperations
  28. {
  29. internal IncomingChangesTab(
  30. WorkspaceInfo wkInfo,
  31. ViewHost viewHost,
  32. WorkspaceWindow workspaceWindow,
  33. NewIncomingChangesUpdater newIncomingChangesUpdater,
  34. CheckIncomingChanges.IUpdateIncomingChanges updateIncomingChanges,
  35. EditorWindow parentWindow)
  36. {
  37. mWkInfo = wkInfo;
  38. mNewIncomingChangesUpdater = newIncomingChangesUpdater;
  39. mParentWindow = parentWindow;
  40. BuildComponents();
  41. mProgressControls = new ProgressControlsForViews();
  42. mErrorsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
  43. new float[] { 0.75f, 0.25f },
  44. new int[] { 100, 100 },
  45. new int[] { 100000, 100000 }
  46. );
  47. mErrorDetailsSplitterState = PlasticSplitterGUILayout.InitSplitterState(
  48. new float[] { 0.60f, 0.40f },
  49. new int[] { 100, 100 },
  50. new int[] { 100000, 100000 }
  51. );
  52. mIncomingChangesViewLogic = new IncomingChangesViewLogic(
  53. wkInfo, viewHost, this, new UnityPlasticGuiMessage(parentWindow),
  54. mProgressControls, updateIncomingChanges,
  55. workspaceWindow.GluonProgressOperationHandler, workspaceWindow,
  56. new IncomingChangesViewLogic.ApplyWorkspaceLocalChanges(),
  57. new IncomingChangesViewLogic.OutOfDateItemsOperations(),
  58. new IncomingChangesViewLogic.ResolveUserName(),
  59. new IncomingChangesViewLogic.GetWorkingBranch(),
  60. NewChangesInWk.Build(wkInfo, new BuildWorkspacekIsRelevantNewChange()),
  61. null);
  62. mIncomingChangesViewLogic.Refresh();
  63. }
  64. bool IIncomingChangesTab.IsVisible
  65. {
  66. get { return mIsVisible; }
  67. set { mIsVisible = value; }
  68. }
  69. void IIncomingChangesTab.OnDisable()
  70. {
  71. TreeHeaderSettings.Save(
  72. mIncomingChangesTreeView.multiColumnHeader.state,
  73. UnityConstants.GLUON_INCOMING_CHANGES_TABLE_SETTINGS_NAME);
  74. TreeHeaderSettings.Save(
  75. mErrorsListView.multiColumnHeader.state,
  76. UnityConstants.GLUON_INCOMING_ERRORS_TABLE_SETTINGS_NAME);
  77. }
  78. void IIncomingChangesTab.Update()
  79. {
  80. mProgressControls.UpdateProgress(mParentWindow);
  81. }
  82. void IIncomingChangesTab.OnGUI()
  83. {
  84. DoActionsToolbar(
  85. mIsProcessMergesButtonVisible,
  86. mIsCancelMergesButtonVisible,
  87. mIsProcessMergesButtonEnabled,
  88. mIsCancelMergesButtonEnabled,
  89. mProcessMergesButtonText,
  90. mIncomingChangesViewLogic,
  91. mIncomingChangesTreeView,
  92. mProgressControls);
  93. bool splitterNeeded = mIsErrorsListVisible;
  94. if (splitterNeeded)
  95. PlasticSplitterGUILayout.BeginVerticalSplit(mErrorsSplitterState);
  96. DoIncomingChangesArea(
  97. mIncomingChangesTreeView,
  98. mPendingConflictsLabelData,
  99. mChangesToApplySummaryLabelText,
  100. mMessageLabelText,
  101. mIsMessageLabelVisible,
  102. mProgressControls.IsOperationRunning());
  103. DoErrorsArea(
  104. mErrorsListView,
  105. mErrorDetailsSplitterState,
  106. mErrorMessageLabelText,
  107. mIsErrorsListVisible,
  108. mIsErrorMessageLabelVisible);
  109. if (splitterNeeded)
  110. PlasticSplitterGUILayout.EndVerticalSplit();
  111. if (mProgressControls.HasNotification())
  112. {
  113. DrawProgressForViews.ForNotificationArea(
  114. mProgressControls.ProgressData);
  115. }
  116. }
  117. void IIncomingChangesTab.AutoRefresh()
  118. {
  119. mIncomingChangesViewLogic.AutoRefresh(DateTime.Now);
  120. }
  121. void IRefreshableView.Refresh()
  122. {
  123. if (mNewIncomingChangesUpdater != null)
  124. mNewIncomingChangesUpdater.Update(DateTime.Now);
  125. mIncomingChangesViewLogic.Refresh();
  126. }
  127. void IncomingChangesViewLogic.IIncomingChangesView.UpdateData(
  128. IncomingChangesTree tree,
  129. List<ErrorMessage> errorMessages,
  130. string processMergesButtonText,
  131. PendingConflictsLabelData conflictsLabelData,
  132. string changesToApplySummaryText)
  133. {
  134. ShowProcessMergesButton(processMergesButtonText);
  135. ((IncomingChangesViewLogic.IIncomingChangesView)this).
  136. UpdatePendingConflictsLabel(conflictsLabelData);
  137. mChangesToApplySummaryLabelText = changesToApplySummaryText;
  138. UpdateIncomingChangesTree(mIncomingChangesTreeView, tree);
  139. UpdateErrorsList(mErrorsListView, errorMessages);
  140. mIsErrorsListVisible = errorMessages.Count > 0;
  141. }
  142. void IncomingChangesViewLogic.IIncomingChangesView.UpdatePendingConflictsLabel(
  143. PendingConflictsLabelData data)
  144. {
  145. mPendingConflictsLabelData = data;
  146. }
  147. void IncomingChangesViewLogic.IIncomingChangesView.UpdateSolvedFileConflicts(
  148. List<IncomingChangeInfo> solvedConflicts,
  149. IncomingChangeInfo currentConflict)
  150. {
  151. mIncomingChangesTreeView.UpdateSolvedFileConflicts(
  152. solvedConflicts, currentConflict);
  153. }
  154. void IncomingChangesViewLogic.IIncomingChangesView.ShowMessage(
  155. string message, bool isErrorMessage)
  156. {
  157. if (isErrorMessage)
  158. {
  159. mErrorMessageLabelText = message;
  160. mIsErrorMessageLabelVisible = true;
  161. return;
  162. }
  163. mMessageLabelText = message;
  164. mIsMessageLabelVisible = true;
  165. }
  166. void IncomingChangesViewLogic.IIncomingChangesView.HideMessage()
  167. {
  168. mMessageLabelText = string.Empty;
  169. mIsMessageLabelVisible = false;
  170. mErrorMessageLabelText = string.Empty;
  171. mIsErrorMessageLabelVisible = false;
  172. }
  173. void IncomingChangesViewLogic.IIncomingChangesView.DisableProcessMergesButton()
  174. {
  175. mIsProcessMergesButtonEnabled = false;
  176. }
  177. void IncomingChangesViewLogic.IIncomingChangesView.ShowCancelButton()
  178. {
  179. mIsCancelMergesButtonEnabled = true;
  180. mIsCancelMergesButtonVisible = true;
  181. }
  182. void IncomingChangesViewLogic.IIncomingChangesView.HideCancelButton()
  183. {
  184. mIsCancelMergesButtonEnabled = false;
  185. mIsCancelMergesButtonVisible = false;
  186. }
  187. SelectedIncomingChangesGroupInfo IIncomingChangesViewMenuOperations.GetSelectedIncomingChangesGroupInfo()
  188. {
  189. return IncomingChangesSelection.GetSelectedGroupInfo(mIncomingChangesTreeView);
  190. }
  191. void IIncomingChangesViewMenuOperations.MergeContributors()
  192. {
  193. List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
  194. GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
  195. mIncomingChangesViewLogic.ProcessMergesForConflicts(
  196. MergeContributorType.MergeContributors,
  197. fileConflicts,
  198. RefreshAsset.UnityAssetDatabase);
  199. }
  200. void IIncomingChangesViewMenuOperations.MergeKeepingSourceChanges()
  201. {
  202. List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
  203. GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
  204. mIncomingChangesViewLogic.ProcessMergesForConflicts(
  205. MergeContributorType.KeepSource,
  206. fileConflicts,
  207. RefreshAsset.UnityAssetDatabase);
  208. }
  209. void IIncomingChangesViewMenuOperations.MergeKeepingWorkspaceChanges()
  210. {
  211. List<IncomingChangeInfo> fileConflicts = IncomingChangesSelection.
  212. GetSelectedFileConflictsIncludingMeta(mIncomingChangesTreeView);
  213. mIncomingChangesViewLogic.ProcessMergesForConflicts(
  214. MergeContributorType.KeepDestination,
  215. fileConflicts,
  216. RefreshAsset.UnityAssetDatabase);
  217. }
  218. void IIncomingChangesViewMenuOperations.DiffIncomingChanges()
  219. {
  220. IncomingChangeInfo incomingChange = IncomingChangesSelection.
  221. GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
  222. if (incomingChange == null)
  223. return;
  224. DiffIncomingChanges(
  225. incomingChange,
  226. mWkInfo);
  227. }
  228. void IIncomingChangesViewMenuOperations.DiffYoursWithIncoming()
  229. {
  230. if (LaunchTool.ShowDownloadPlasticExeWindow(true))
  231. return;
  232. IncomingChangeInfo incomingChange = IncomingChangesSelection.
  233. GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
  234. if (incomingChange == null)
  235. return;
  236. DiffYoursWithIncoming(
  237. incomingChange,
  238. mWkInfo);
  239. }
  240. void IncomingChangesViewMenu.IMetaMenuOperations.DiffIncomingChanges()
  241. {
  242. IncomingChangeInfo incomingChange = IncomingChangesSelection.
  243. GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
  244. if (incomingChange == null)
  245. return;
  246. DiffIncomingChanges(
  247. mIncomingChangesTreeView.GetMetaChange(incomingChange),
  248. mWkInfo);
  249. }
  250. void IncomingChangesViewMenu.IMetaMenuOperations.DiffYoursWithIncoming()
  251. {
  252. if (LaunchTool.ShowDownloadPlasticExeWindow(true))
  253. return;
  254. IncomingChangeInfo incomingChange = IncomingChangesSelection.
  255. GetSingleSelectedIncomingChange(mIncomingChangesTreeView);
  256. if (incomingChange == null)
  257. return;
  258. DiffYoursWithIncoming(
  259. mIncomingChangesTreeView.GetMetaChange(incomingChange),
  260. mWkInfo);
  261. }
  262. bool IncomingChangesViewMenu.IMetaMenuOperations.SelectionHasMeta()
  263. {
  264. return mIncomingChangesTreeView.SelectionHasMeta();
  265. }
  266. static void DiffIncomingChanges(
  267. IncomingChangeInfo incomingChange,
  268. WorkspaceInfo wkInfo)
  269. {
  270. if (LaunchTool.ShowDownloadPlasticExeWindow(true))
  271. return;
  272. DiffOperation.DiffRevisions(
  273. wkInfo,
  274. incomingChange.GetMount().RepSpec,
  275. incomingChange.GetBaseRevision(),
  276. incomingChange.GetRevision(),
  277. incomingChange.GetPath(),
  278. incomingChange.GetPath(),
  279. true,
  280. xDiffLauncher: null,
  281. imageDiffLauncher: null);
  282. }
  283. static void DiffYoursWithIncoming(
  284. IncomingChangeInfo incomingChange,
  285. WorkspaceInfo wkInfo)
  286. {
  287. if (LaunchTool.ShowDownloadPlasticExeWindow(true))
  288. return;
  289. DiffOperation.DiffYoursWithIncoming(
  290. wkInfo,
  291. incomingChange.GetMount(),
  292. incomingChange.GetRevision(),
  293. incomingChange.GetPath(),
  294. xDiffLauncher: null,
  295. imageDiffLauncher: null);
  296. }
  297. static void UpdateErrorsList(
  298. ErrorsListView errorsListView,
  299. List<ErrorMessage> errorMessages)
  300. {
  301. errorsListView.BuildModel(errorMessages);
  302. errorsListView.Reload();
  303. }
  304. void UpdateProcessMergesButtonText()
  305. {
  306. mProcessMergesButtonText =
  307. mIncomingChangesViewLogic.GetProcessMergesButtonText();
  308. }
  309. void ShowProcessMergesButton(string processMergesButtonText)
  310. {
  311. mProcessMergesButtonText = processMergesButtonText;
  312. mIsProcessMergesButtonEnabled = true;
  313. mIsProcessMergesButtonVisible = true;
  314. }
  315. void DoActionsToolbar(
  316. bool isProcessMergesButtonVisible,
  317. bool isCancelMergesButtonVisible,
  318. bool isProcessMergesButtonEnabled,
  319. bool isCancelMergesButtonEnabled,
  320. string processMergesButtonText,
  321. IncomingChangesViewLogic incomingChangesViewLogic,
  322. IncomingChangesTreeView incomingChangesTreeView,
  323. ProgressControlsForViews progressControls)
  324. {
  325. GUIStyle guiStyle = new GUIStyle();
  326. guiStyle.margin = new RectOffset(5, 5, 5, 5);
  327. EditorGUILayout.BeginHorizontal(guiStyle);
  328. if (isProcessMergesButtonVisible)
  329. {
  330. DoProcessMergesButton(
  331. isProcessMergesButtonEnabled,
  332. processMergesButtonText,
  333. incomingChangesViewLogic,
  334. incomingChangesTreeView);
  335. }
  336. if (isCancelMergesButtonVisible)
  337. {
  338. DoCancelMergesButton(
  339. isCancelMergesButtonEnabled,
  340. incomingChangesViewLogic);
  341. }
  342. if (progressControls.IsOperationRunning())
  343. {
  344. DrawProgressForViews.ForIndeterminateProgress(
  345. progressControls.ProgressData);
  346. }
  347. GUILayout.FlexibleSpace();
  348. DoRefreshButton(
  349. !progressControls.IsOperationRunning(),
  350. incomingChangesViewLogic);
  351. EditorGUILayout.EndHorizontal();
  352. }
  353. static void DoIncomingChangesArea(
  354. IncomingChangesTreeView incomingChangesTreeView,
  355. PendingConflictsLabelData pendingConflictsLabelData,
  356. string changesToApplySummaryLabelText,
  357. string messageLabelText,
  358. bool isMessageLabelVisible,
  359. bool isOperationRunning)
  360. {
  361. EditorGUILayout.BeginVertical();
  362. DoPendingConflictsAndChangesToApplyLabel(
  363. pendingConflictsLabelData,
  364. changesToApplySummaryLabelText);
  365. DoIncomingChangesTreeViewArea(
  366. incomingChangesTreeView,
  367. isOperationRunning);
  368. if (isMessageLabelVisible)
  369. DoInfoMessageArea(messageLabelText);
  370. EditorGUILayout.EndVertical();
  371. }
  372. static void DoProcessMergesButton(
  373. bool isEnabled,
  374. string processMergesButtonText,
  375. IncomingChangesViewLogic incomingChangesViewLogic,
  376. IncomingChangesTreeView incomingChangesTreeView)
  377. {
  378. GUI.enabled = isEnabled;
  379. if (DrawActionButton.For(processMergesButtonText))
  380. {
  381. List<IncomingChangeInfo> incomingChanges =
  382. incomingChangesViewLogic.GetCheckedChanges();
  383. incomingChangesTreeView.FillWithMeta(incomingChanges);
  384. if (incomingChanges.Count == 0)
  385. return;
  386. incomingChangesViewLogic.ProcessMergesForItems(
  387. incomingChanges,
  388. RefreshAsset.UnityAssetDatabase);
  389. }
  390. GUI.enabled = true;
  391. }
  392. void DoCancelMergesButton(
  393. bool isEnabled,
  394. IncomingChangesViewLogic incomingChangesViewLogic)
  395. {
  396. GUI.enabled = isEnabled;
  397. if (DrawActionButton.For(PlasticLocalization.GetString(
  398. PlasticLocalization.Name.CancelButton)))
  399. {
  400. incomingChangesViewLogic.Cancel();
  401. mIsCancelMergesButtonEnabled = false;
  402. }
  403. GUI.enabled = true;
  404. }
  405. void DoErrorsArea(
  406. ErrorsListView errorsListView,
  407. object splitterState,
  408. string errorMessageLabelText,
  409. bool isErrorsListVisible,
  410. bool isErrorMessageLabelVisible)
  411. {
  412. EditorGUILayout.BeginVertical();
  413. if (isErrorsListVisible)
  414. {
  415. DrawSplitter.ForHorizontalIndicator();
  416. DoErrorsListArea(errorsListView, splitterState);
  417. }
  418. if (isErrorMessageLabelVisible)
  419. DoErrorMessageArea(errorMessageLabelText);
  420. EditorGUILayout.EndVertical();
  421. }
  422. static void DoPendingConflictsAndChangesToApplyLabel(
  423. PendingConflictsLabelData pendingConflictsLabelData,
  424. string changesToApplySummaryLabelText)
  425. {
  426. EditorGUILayout.BeginHorizontal();
  427. GUIStyle pendingConflictsOfTotalStyle =
  428. pendingConflictsLabelData.HasPendingConflicts ?
  429. UnityStyles.IncomingChangesTab.RedPendingConflictsOfTotalLabel :
  430. UnityStyles.IncomingChangesTab.GreenPendingConflictsOfTotalLabel;
  431. GUILayout.Label(
  432. pendingConflictsLabelData.PendingConflictsOfTotalText,
  433. pendingConflictsOfTotalStyle);
  434. GUILayout.Label(
  435. pendingConflictsLabelData.PendingConflictsLabelText,
  436. UnityStyles.IncomingChangesTab.PendingConflictsLabel);
  437. GUILayout.Space(5);
  438. GUILayout.Label(
  439. changesToApplySummaryLabelText,
  440. UnityStyles.IncomingChangesTab.ChangesToApplySummaryLabel);
  441. GUILayout.FlexibleSpace();
  442. EditorGUILayout.EndHorizontal();
  443. }
  444. static void UpdateIncomingChangesTree(
  445. IncomingChangesTreeView incomingChangesTreeView,
  446. IncomingChangesTree tree)
  447. {
  448. incomingChangesTreeView.BuildModel(
  449. UnityIncomingChangesTree.BuildIncomingChangeCategories(tree));
  450. incomingChangesTreeView.Sort();
  451. incomingChangesTreeView.Reload();
  452. }
  453. static void DoIncomingChangesTreeViewArea(
  454. IncomingChangesTreeView incomingChangesTreeView,
  455. bool isOperationRunning)
  456. {
  457. GUI.enabled = !isOperationRunning;
  458. Rect rect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
  459. incomingChangesTreeView.OnGUI(rect);
  460. GUI.enabled = true;
  461. }
  462. void DoErrorsListArea(
  463. ErrorsListView errorsListView,
  464. object splitterState)
  465. {
  466. EditorGUILayout.BeginVertical();
  467. GUILayout.Label(
  468. PlasticLocalization.GetString(
  469. PlasticLocalization.Name.IncomingChangesCannotBeApplied),
  470. EditorStyles.boldLabel);
  471. DoErrorsListSplitViewArea(
  472. errorsListView, splitterState);
  473. EditorGUILayout.EndVertical();
  474. }
  475. static void DoErrorMessageArea(string message)
  476. {
  477. EditorGUILayout.BeginHorizontal();
  478. EditorGUILayout.HelpBox(message, MessageType.Error);
  479. EditorGUILayout.EndHorizontal();
  480. }
  481. void DoErrorsListSplitViewArea(
  482. ErrorsListView errorsListView,
  483. object splitterState)
  484. {
  485. EditorGUILayout.BeginHorizontal();
  486. PlasticSplitterGUILayout.BeginHorizontalSplit(splitterState);
  487. DoErrorsListViewArea(errorsListView);
  488. DoErrorDetailsTextArea(errorsListView.GetSelectedError());
  489. PlasticSplitterGUILayout.EndHorizontalSplit();
  490. EditorGUILayout.EndHorizontal();
  491. }
  492. static void DoErrorsListViewArea(
  493. ErrorsListView errorsListView)
  494. {
  495. Rect treeRect = GUILayoutUtility.GetRect(0, 100000, 0, 100000);
  496. errorsListView.OnGUI(treeRect);
  497. }
  498. void DoErrorDetailsTextArea(ErrorMessage selectedErrorMessage)
  499. {
  500. string errorDetailsText = selectedErrorMessage == null ?
  501. string.Empty : selectedErrorMessage.Error;
  502. mErrorDetailsScrollPosition = GUILayout.BeginScrollView(
  503. mErrorDetailsScrollPosition);
  504. GUILayout.TextArea(
  505. errorDetailsText, UnityStyles.TextFieldWithWrapping,
  506. GUILayout.ExpandHeight(true));
  507. GUILayout.EndScrollView();
  508. }
  509. static void DoRefreshButton(
  510. bool isEnabled,
  511. IncomingChangesViewLogic incomingChangesViewLogic)
  512. {
  513. GUI.enabled = isEnabled;
  514. if (GUILayout.Button(new GUIContent(
  515. Images.GetRefreshIcon())))
  516. incomingChangesViewLogic.Refresh();
  517. GUI.enabled = true;
  518. }
  519. static void DoInfoMessageArea(string message)
  520. {
  521. EditorGUILayout.BeginHorizontal();
  522. EditorGUILayout.HelpBox(message, MessageType.Info);
  523. EditorGUILayout.EndHorizontal();
  524. }
  525. void BuildComponents()
  526. {
  527. IncomingChangesTreeHeaderState incomingChangesHeaderState =
  528. IncomingChangesTreeHeaderState.GetDefault();
  529. TreeHeaderSettings.Load(incomingChangesHeaderState,
  530. UnityConstants.GLUON_INCOMING_CHANGES_TABLE_SETTINGS_NAME,
  531. (int)IncomingChangesTreeColumn.Path, true);
  532. mIncomingChangesTreeView = new IncomingChangesTreeView(
  533. mWkInfo, incomingChangesHeaderState,
  534. IncomingChangesTreeHeaderState.GetColumnNames(),
  535. new IncomingChangesViewMenu(this, this),
  536. UpdateProcessMergesButtonText);
  537. mIncomingChangesTreeView.Reload();
  538. ErrorsListHeaderState errorsListHeaderState =
  539. ErrorsListHeaderState.GetDefault();
  540. TreeHeaderSettings.Load(errorsListHeaderState,
  541. UnityConstants.GLUON_INCOMING_ERRORS_TABLE_SETTINGS_NAME,
  542. UnityConstants.UNSORT_COLUMN_ID);
  543. mErrorsListView = new ErrorsListView(errorsListHeaderState);
  544. mErrorsListView.Reload();
  545. }
  546. bool mIsVisible;
  547. bool mIsProcessMergesButtonVisible;
  548. bool mIsCancelMergesButtonVisible;
  549. bool mIsMessageLabelVisible;
  550. bool mIsErrorMessageLabelVisible;
  551. bool mIsErrorsListVisible;
  552. bool mIsProcessMergesButtonEnabled;
  553. bool mIsCancelMergesButtonEnabled;
  554. string mProcessMergesButtonText;
  555. string mMessageLabelText;
  556. string mErrorMessageLabelText;
  557. PendingConflictsLabelData mPendingConflictsLabelData;
  558. string mChangesToApplySummaryLabelText;
  559. IncomingChangesTreeView mIncomingChangesTreeView;
  560. ErrorsListView mErrorsListView;
  561. object mErrorsSplitterState;
  562. object mErrorDetailsSplitterState;
  563. readonly ProgressControlsForViews mProgressControls;
  564. Vector2 mErrorDetailsScrollPosition;
  565. readonly IncomingChangesViewLogic mIncomingChangesViewLogic;
  566. readonly EditorWindow mParentWindow;
  567. readonly NewIncomingChangesUpdater mNewIncomingChangesUpdater;
  568. readonly WorkspaceInfo mWkInfo;
  569. }
  570. }