50 Commits

Author SHA1 Message Date
patrick boutot
a2b5613488 Slate: Deprecate SListView::ItemHeight and STreeViewItemHeight. ItemHeight and ItemWidth are only used when the panel is is as a tile or both value are assigned. With TreeView and ListView, you can't assigned both. The function are protected, a subclass of those could but it's up to them to expose the ItemHeight and ItemWidth. This behavior changed was introduced with CL 7634094.
#jira UE-210415
#rb editor-ui-systems

[CL 33370360 by patrick boutot in ue5-main branch]
2024-05-01 08:05:39 -04:00
SRombauts
f8c3d8d3c7 PR #10755: [5.3][Plastic SCM] Fix context Check In from content browser
PR #10378 [Source Control][5.2] Fix the Check In option in the context menu for Git & Plastic SCM


[FYI] wouter.burgers
#rb brooke.hubert
#jira UE-192845
#jira UE-184025

[CL 32232897 by SRombauts in ue5-main branch]
2024-03-13 19:06:04 -04:00
steve robb
f8d47335a4 Replaced RemoveAt(N, 1, EAllowShrinking::*) with RemoveAt(N, EAllowShrinking::*).
[CL 31626444 by steve robb in ue5-main branch]
2024-02-19 16:51:58 -05:00
wouter burgers
be0ae3108b Buildfix: Fixed LOCTEXT error introduced in PR #31119614.
#jira UE-205880
#fyi manuel.lang
#rnx

[CL 31174444 by wouter burgers in ue5-main branch]
2024-02-05 10:43:41 -05:00
steve robb
d7e4f5029a Fixed more bAllowShrinking usage.
[CL 31121041 by steve robb in ue5-main branch]
2024-02-02 07:16:11 -05:00
SRombauts
731893dda3 PR #11295: [Source Control] Update Plastic SCM provider to 1.9.0 (from 1.8.0)
Compared to the PR:
- Fixed non-Unity compiles by adding several header includes.
- Fixed Linux compile error in SPlasticSourceControlBranchesWidget.cpp: FPlasticSourceControlBranchPtr vs FPlasticSourceControlBranchRef usage in ::GetSelectedBranches().

#jira UE-203360
#rb Manuel.Lang
#review-30764285

[CL 31119614 by SRombauts in ue5-main branch]
2024-02-02 04:31:07 -05:00
steve robb
6d5b974842 Fixed up a lot of bool-taking container resize functions to take EAllowShrinking instead.
[CL 30735396 by steve robb in ue5-main branch]
2024-01-19 19:41:56 -05:00
paul chipchase
0743e8dd17 Fix SOURCE_CONTROL_WITH_SLATE to work properly again in the SourceControl module
#rb wouter.burgers
#rnx

### SourceControl
- Remove link to "InputCore" as it is not used
- Only include slate and rendering modules if the target we are building for uses slate.
- Define SOURCE_CONTROL_WITH_SLATE as 0 if the target we are building for does not use slate.

- When SOURCE_CONTROL_WITH_SLATE is zero the following will be applied:
-- FRevisionControlStyleManager will not be compiled as it only makes sense if slate is enabled.
-- The monitoring aspect of FSourceControlFileStatusMonitor will be disabled as we cannot be notified of user interactions.
-- FScopedSourceControlProgress will compile but essentially do nothing.
-- The ::GetIcon method of ISourceControlState will no longer be compiled as it returns a FSlateIcon by value.

[CL 29516345 by paul chipchase in ue5-main branch]
2023-11-07 06:18:43 -05:00
jeanfrancois dube
87618ccfe5 Optimize source control changelist shelved state update.
Results with a 40K actors changelist editor startup time:
  - Before: FPerforce::AddShelvedFilesToChangelist took 2:35 min
  - After: FPerforce::AddShelvedFilesToChangelist took 160.08 ms

#rb sebastien.lussier
[FYI] jeansebastien.guay

[CL 29047110 by jeanfrancois dube in ue5-main branch]
2023-10-24 11:33:28 -04:00
paul chipchase
e249c6fdd2 Truncation warning fixes for PlasticSourceControl module
#rb trivial
#rnx

[CL 26603898 by paul chipchase in ue5-main branch]
2023-07-26 08:52:02 -04:00
Steve Robb
9c93757c28 Fixed mismatched copy constuctor/assignment operator in FPlasticSourceControlChangelist.
#rb none
#jira none
#preflight none

[CL 25580530 by Steve Robb in ue5-main branch]
2023-05-23 08:32:35 -04:00
jordan hoffmann
2b08e650c7 [CDPR] Added more information about changelist to source control changelists window context menu
+ Expand source control menu context with selected changelist,
+ Expose information about if changelist is default and its source control specific identifier,

#rb Patrick.Enfedaque, Patrick.Laflamme, zach.rammell
#preflight skip
#p4v-cherrypick 25526575
#preflight 64665919b91ab13b09c2089c

[CL 25528171 by jordan hoffmann in ue5-main branch]
2023-05-18 13:20:35 -04:00
jordan hoffmann
1625c5cc66 [BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest
#rb brooke.hubert, mattias.jansson, wouter.burgers
#preflight 64556c1ad77a82d6a78e3388

[CL 25365368 by jordan hoffmann in ue5-main branch]
2023-05-06 02:07:43 -04:00
jordan hoffmann
fbe917e059 [BugFix] Review tool failing to connect to swarm
- Failed if user had multiple p4 tickets
- Failed if default p4 username didn't match the provided username in UE

#jira UE-181982
#rb paul.chipchase
#preflight 643061621d61ecec3b63c465

[CL 24970980 by jordan hoffmann in ue5-main branch]
2023-04-07 17:50:46 -04:00
zach rammell
2a30d789bd [Plastic SCM] Fix implementation of ISourceControlProvider::UsesFileRevisions()
PR #10271
#rb zach.rammell
#lockdown jeanmichel.dignard
#jira UE-180938
#preflight 64223ac4051bec41cd4c6871

[CL 24821272 by zach rammell in ue5-main branch]
2023-03-28 12:38:33 -04:00
marco anastasi
f6978a065c Created new Source Control feature flag UsesSnapshots() to solve inconsistency in use of UsesChangelists() and UsesFileRevisions() causing issues for git Source Control Provider
* Option to check in an asset from the Content Browser Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to check in an asset from the Scene Outliner Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Ability to uncheck files in the Submit Files Window is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to revert the writable flag on an asset in the Content Browser Source Control Context Menu is now enabled if the SCC uses checkout instead of if it uses File Revisions (like the 'Make Writable' option)

#jira UCS-6630
#rb brooke.hubert, wouter.burgers
#lockdown jeanmichel.dignard
#preflight 640e6b41482188d710ff8316

[CL 24724061 by marco anastasi in ue5-main branch]
2023-03-20 17:20:41 -04:00
paul chipchase
a41176c8a0 Fix a crash in the PlasticSCM module that can occur if the engine shutdown during PreInit.
#rb PJ.Kack
#jira UE-179343
#rnx
#preflight 6408511a6c1b9295b9804827

- The crash itself isn't that interesting but it does distract the user from the actual error/problem which caused the engine to shutdown during PreInit wasting time while they look into the crash instead of the original error.
- When attempting to unregister the menu extension we now call ::TryGet rather than ::Try as this will return nullptr if UToolsMenu is not loaded and will not attempt to load it.

[CL 24563201 by paul chipchase in ue5-main branch]
2023-03-08 13:26:42 -05:00
SRombauts
07e56bd041 PR #10129: [Source Control] Update the Plastic SCM plugin to version 1.8.0 (from 1.6.2) (Contributed by SRombauts)
#Jira UE-177799
#rb brooke.hubert
#preflight 63f400211d71bcd26257d30b
#lockdown jeanmichel.dignard

[CL 24343515 by SRombauts in ue5-main branch]
2023-02-21 13:08:07 -05:00
wouter burgers
1d6ef4b2e3 SourceControl: Added CanExecuteOperation to ISourceControlProvider interface.
#preflight 63de1752fe33a06594fc2e02

[CL 24018386 by wouter burgers in ue5-main branch]
2023-02-04 10:54:03 -05:00
stuart hill
d8b31f7ed0 Add a flag to the source control provider to tell us if 'uncontrolled' changelists are supported.
#rb Marco.Anastasi, zach.rammell
#prelight 6398633f8c5081ee9a275f20

[CL 23499875 by stuart hill in ue5-main branch]
2022-12-13 18:18:02 -05:00
aditya ravichandran
28eccf9aa0 Revision Control Iconography Update:
Update the default set of revision control icons
Create FRevisionControlStyleManager to manage the currently active revision control style and add a default style that is used by all providers
#rb lauren.barnes, brooke.hubert
#preflight 639364ee67018b14b5fb9891

[CL 23466976 by aditya ravichandran in ue5-main branch]
2022-12-09 14:18:01 -05:00
henrik karlsson
fa90b399a4 Added includes for future change. This changelist only contains added #include and a couple of empty placeholder files
Tested compiling fortnite, unrealeditor, lyra, qagame with non-unity/pch

#preflight 63635997876630122adeab9f
#rb none

[CL 22958990 by henrik karlsson in ue5-main branch]
2022-11-03 14:18:47 -04:00
stuart hill
1fc502d9b1 Give the option to disable being able to diff files in the Source Control Submit Widget. To allow this, AllowsDiffAgainstDepot function should return false.
#preflight 6360fd498768c5532f5425f0
#rb Marco.Anastasi, Patrick.Laflamme

[CL 22888653 by stuart hill in ue5-main branch]
2022-11-01 15:09:57 -04:00
christian savoie
fd89edb9be Add access to local revision number for all source control systems.
Change perforce Revert option to be based on if an item is checked out or marked for add, rather than if it can be checked in.

#tests Used to implement source control menu refactor https://p4-swarm.epicgames.net/reviews/22528870

[CL 22863683 by christian savoie in ue5-main branch]
2022-10-31 11:08:06 -04:00
christian savoie
48b260a74e Fix Perforce Sync command to correctly use Revision value.
Add Revision and Force options to Plastic and Subversion.

#tests Used when implementing source control menu refactor  https://p4-swarm.epicgames.net/reviews/22528870, only tested perforce sync command.

[CL 22683432 by christian savoie in ue5-main branch]
2022-10-21 01:05:23 -04:00