Commit Graph

68 Commits

Author SHA1 Message Date
ben hoffman
1fc0b264e1 Editor | Confirm changelist submit window fixes
- Fix UDataValidationChangelist warnings not propagating to the window properly and only being emitted into the Message Log
- Fix asset validation warnings not appearing in the Confirm changelist submit window if the validator says the asset is valid
- Fix tokenized messages appearing blank

#rb Sebastien.Lussier
#jira none

#ushell-cherrypick of 34860898 by gabriel.wreczycki

[CL 34879202 by ben hoffman in ue5-main branch]
2024-07-17 14:43:30 -04:00
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
jeanfrancois dube
e9ad689957 Source Control: don't show the success icon when unable to submit the changelist and there's no warnings or errors.
#rb Richard.Malo
[FYI] jeansebastien.guay

[CL 30187851 by jeanfrancois dube in ue5-main branch]
2023-12-07 14:14:32 -05:00
marco anastasi
d21b6c2cd0 Added ability to revert conflicted files in the Submit Files window.
A side effect of showing conflicted items greyed out in the Submit Files window is that the Revert operation is also disabled as greyed-out items are not selectable. This is not desirable as the user may well want to get out of a conflict situation by reverting the conflicted file and the submit dialog is a convenient place to do that.

#rb stuart.hill, manuel.lang
#preflight none

[CL 25333894 by marco anastasi in ue5-main branch]
2023-05-04 09:30:48 -04:00
wouter burgers
1f3f797346 SourceControl: Revert individual added non-package filse in check-in window sometimes does not work.
#preflight none

[CL 24646650 by wouter burgers in ue5-main branch]
2023-03-14 18:59:26 -04:00
wouter burgers
7403ba2cf4 SourceControl: After reverting all files in the 'Submit Files' dialog, close it.
#preflight none

[CL 24557400 by wouter burgers in ue5-main branch]
2023-03-08 06:19:24 -05:00
wouter burgers
ee0bc4b3f4 SourceControl / UEFN: Hide UEFN 'Revert' functionality behind cvars.
#preflight none
#preflight 640841a4827cf9251bf9f30d

[CL 24556839 by wouter burgers in ue5-main branch]
2023-03-08 05:01:20 -05:00
marco anastasi
0e8453ff5e Added context menu option to revert assets in the submit changes dialog
#preflight 63dcf50478716a01e80bc3b8
#rb wouter.burgers, stuart.hill, brooke.hubert
[FYI] manuel.lang, jeansebastien.guay

[CL 24051196 by marco anastasi in ue5-main branch]
2023-02-07 12:07:01 -05:00
paul chipchase
7c4a834261 Change TryVirtualizePackages/TryRehydratePackages to return the corresponding results structure rather than an enum value.
#rb Per.Larsson
#jira UE-169626
#rnx
#preflight 63bd670a71079a8d1c0e837b

- Since the API was forcing the caller to pass in a results structure to be filled in, we might as well make it the return value.
- Added a ::WasSuccessful method to the results structures that can be used instead of checking if the result had errors or not.
- Remove the reset method from FVirtualizationResult/FRehydrationResult as they no longer need it.
- The older deprecated methods still use the results enum, so we cannot easily deprecate those enums yet.

[CL 23626072 by paul chipchase in ue5-main branch]
2023-01-10 09:15:11 -05:00
paul chipchase
80beaf7cc8 Add a new overload to IVirtualizationSystem::TryVirtualizePackages, which takes additional options (via a bitfield enum) and returns more info about the resulting process. The original version has been drepcated.
#rb Per.Larsson
#jira UE-169626
#rnx
#preflight 639c4112012902cb8db43e13

- This allows us to provide the user with more ways to customize the virtualization and return more detailed info about it if the calling code wishes to log additional info. In both cases we can extend the options and the data returned without changing the API.
- Previously if we virtualized a package that was not checked out in revision control we would warn the user and then skip updating the package file on disk. This means the payloads would be uploaded but the user would be left with no local changes. Since sometimes we know we don't need to check out any package (virtualizing the packages in a change list for example) we don't want to always incur the cost of polling reivision control to see which packages do need checking out. This is why we now allow the caller to request package files be checked out via the new options enum EVirtualizationOptions.
-- If the EVirtualizationOptions::Checkout flag is provided we will poll the revision control status of all package files and then check out those which need it.
-- We still check if packages can be modified and warn the user if they can't, as package files could be locked in other ways.
- Added a new utility function to SourceControlUtilties to make it easier to check out packages. There is similar functionality elsewhere in the code base but the virtualization module is too low level to make use of it.
- Updated existing code that calls ::TryVirtualizePackages and add cases of ''using namespace UE::Virtualization' where required to improve readability.
- The UnrealVirtualizationTool now supports a new cmdline option "-checkout" that can be used when virtualizing packages. This will checkout any package that was actually virtualized so the result can be saved back out to the workspace domain. This means we no longer require the caller to have checked out the packages before running the tool.

[CL 23536832 by paul chipchase in ue5-main branch]
2022-12-16 06:25:07 -05:00
aditya ravichandran
0d52522f00 Submit Files: Fix missing revision control icons
#jira UE-172827
#rb trivial

[CL 23531436 by aditya ravichandran in ue5-main branch]
2022-12-15 15:58:40 -05:00
aditya ravichandran
f8b7ee5555 Replace any instances of "Source Control" with "Revision Control" in text in the Editor
#rb JeanMichel.Dignard, Robb.Surridge
#preflight 637d180efa348e8480e8837e

[CL 23250808 by aditya ravichandran in ue5-main branch]
2022-11-23 11:57:50 -05:00
patrick laflamme
2abc22e6e8 Inverted the 'Save' and 'Submit' button position in the SSourceControlSubmit widget to be in the same position as Perforce submit dialog (from left to right now we have [Submit, Save, Cancel] instead of [Save, Submit, Cancel])
#rb Aditya.Ravichandran
#preflight 6362b9b2522c8f7ab34bd892

[CL 22937881 by patrick laflamme in ue5-main branch]
2022-11-02 23:06:08 -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
patrick laflamme
613bcd7b4d Fixed the 'Submit Window' saving the description of the default changelist into a new changelist without moving the files.
- In the 'Submit' window, renamed the 'Apply' button to 'Save' button.
  - If the user saves with the 'default' changelist, a new changelist is created with the user description and files are moved into that changelist.
  - If the user saves with any other changelist, ony the description is edited.

#rb Luc.Eygasier
#preflight 631a13a2304480f8f85aba2c

[CL 21909342 by patrick laflamme in ue5-main branch]
2022-09-08 20:48:26 -04:00
patrick laflamme
1b1d508110 Renamed the 'Update' button as 'Apply' in the submit changelist window to mimic P4 vocabulary and added a tooltip.
#rb trivial
#preflight 6308bb761615ec0db54b4e7e

[CL 21595376 by patrick laflamme in ue5-main branch]
2022-08-26 14:30:23 -04:00
patrick laflamme
bff7926319 Modified the source control submit window opened from the changelist window:
- Supported editing the changelist and saving it in P4. If the submit fails, the code will also try to save any edited changelist description.
  - Enabled the 'keep checked out' button when submitting from the changelist window.
  - Fixed the P4 cache not properly updating the file 'kept in checkout'.
  - If the submit window is opened from the Source Control menu at the bottom right of the Eitor, the new 'Update' button to save the changelist description is not visible, this is not supported for all source control provider.

Added a delay of 1.5 seconds before showing the slow stack in the changelist window when refreshing the UI.

#jira UE-155238 - Add the option to "keep file in checkout"
#jira UE-155235 - Allow the user to save the description from the submit window.
#rb Patrick.Enfedaque
#preflight 6303e4e75a5d4e4624f5ab6d

[CL 21512088 by patrick laflamme in ue5-main branch]
2022-08-23 13:05:52 -04:00
Patrick Laflamme
6e14c8ab00 FORT-493076 - Source Control Edtior - Need a vertical scroll bar in that validation box when submitting
#preflight 62f5212a3f500fb6dc71f5bb

[CL 21337251 by Patrick Laflamme in ue5-main branch]
2022-08-11 11:37:14 -04:00
jeanfrancois dube
5dcc8dc617 Changelist validations: split changelist validation warnings and errors.
#rb patrick.enfedaque
#preflight none
#rnx

#ROBOMERGE-AUTHOR: jeanfrancois.dube
#ROBOMERGE-SOURCE: CL 21267254 via CL 21267256 via CL 21267257
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21267736 by jeanfrancois dube in ue5-main branch]
2022-08-08 09:19:30 -04:00
paul chipchase
135e304463 Add an ini file option which when set to true allows package submissions to source control to go ahead even if the virtualization process failed.
#rb none
#jira UE-159596
#rnx
#preflight 62d94160110da0f944afdd32

### Problem
- When rolling our virtualization to projects we have run into a number of set up problems which has caused users to fail to submit packages from the editor as when the virtualization failed we prevented the overall submit from going through.
- Although we will eventually work through all of these problems and add better fault tolerance for now it is annoying for the content team so we need an easy way for a project to allow package submits to be completed even if the virtualization process part of the submit failed.
- Worth noting that the virtualization process failing should never affect the state of the package files, the only downside is that the packages may not be virtualized.

### Fix
- The virtualization/rehydration of packages now return an enum instead of a bool although at the moment we are only returning Success and Failed, but it will allow us to expand in the future
- Combined the code calling the virtualization process from both the source control window and the source control changelist window into a single utility function.
-- Now the two windows only diverge on how they report failure to the user.

- This new utility function now checks to see if the virtualization manager suggests if failing the virtualization process should block any package submission to source control or not.
- I am not happy with this solution, but I haven't come up with anything that feels right, this solution will at least work.

[CL 21199597 by paul chipchase in ue5-main branch]
2022-07-21 08:31:47 -04:00
bryan sefcik
435d89dea4 Manually updated a few files in Engine/Source/Editor/... to include some headers that were found to be missing after running IWYU.
#preflight 62cdac5084556536d0e57c64

[CL 21058996 by bryan sefcik in ue5-main branch]
2022-07-12 13:45:01 -04:00
Robb Surridge
0a5a02c5b2 Coding standard fixes: gender-inclusive language
#jira UE-156429
#preflight 62b32e826a25ba6ae52f94bd
#rb jason.walter

[CL 20795375 by Robb Surridge in ue5-main branch]
2022-06-23 11:14:07 -04:00
SRombauts
d7632b3b78 Fixed the Source Control SavedChangeListDescription being errased on Construct (Contributed by SRombauts)
#9112: [Source Control] Fix the SavedChangeListDescription being errased on Construct (Contributed by SRombauts)
#jira UE-149682 - GitHub 9112 : [Source Control] Fix the SavedChangeListDescription being errased on Construct
#rb patrick.laflamme
#preflight 6282968d0a161b890cbf146e

[CL 20228474 by SRombauts in ue5-main branch]
2022-05-16 14:27:32 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00