Commit Graph

295 Commits

Author SHA1 Message Date
Dan Oconnor
ecf26f06cd Removed restrictive CanExecuteDiffSelected logic, it's safe to diff any matching asset type
[CL 2666437 by Dan Oconnor in Main branch]
2015-08-24 14:59:56 -04:00
Dmitry Rekman
e1fe9b045b Fix CIS (non-unity build, shadowing issue).
#codereview Lina.Halper

[CL 2665437 by Dmitry Rekman in Main branch]
2015-08-23 01:57:34 -04:00
Lina Halper
fc379a5acb - Enable path column and give option for asset picker
- Added type to be optional as lots of asset picker only shows one type
- Added new option to sort by path first
- Made persona asset browser to show path, and sort by path
- Made skeleton widget to hide type but path.

Merging

//depot/UE4-Orion/Engine/Source/Editor/...

to //depot/UE4/Engine/Source/Editor/...

[CL 2664881 by Lina Halper in Main branch]
2015-08-21 16:13:19 -04:00
Timothy Reynolds
4530cdae7a Added copy/paste keyboard shortcuts to the content browser.
UE-16354

[CL 2657781 by Timothy Reynolds in Main branch]
2015-08-17 10:14:17 -04:00
Jamie Dale
7b0996a74a Fixed drag and drop only working in the Content Browser tile view
UE-19914 - Different Drag and Drop Behavior between Tile, List, and Column Views in the Content Browser

The list view was missing its callbacks for the drag and drop operations, and the column view wasn't forwarding on the events from the column row on to the internal asset view item.

[CL 2652916 by Jamie Dale in Main branch]
2015-08-12 11:58:33 -04:00
Jamie Dale
466912cfbe Fixed FAssetDataGatherer::PrioritizeSearchPath not working with the root paths
FPackageName::IsValidLongPackageName would fail for the root paths as the mount path roots all end with a trailing slash, however FPackageName::IsValidLongPackageName doesn't accept paths that end in a trailing slash (as it's expected to be working with names, not paths).

This change updates FAssetDataGatherer::PrioritizeSearchPath to use FPackageName::TryConvertLongPackageNameToFilename instead (which will gracefully fail on an invalid path), and SPathView makes sure that it appends a trailing slash to the path it gives to FAssetDataGatherer::PrioritizeSearchPath.

[CL 2642169 by Jamie Dale in Main branch]
2015-08-03 13:14:52 -04:00
Jamie Dale
4cd0f15bf5 Fixed a crash when summoning the collections context menu with no collections were selected
UE-19478 - Crash when right-clicking in the collections area of the source panel with private collections present

[CL 2641829 by Jamie Dale in Main branch]
2015-08-03 09:13:32 -04:00
Saul Abreu
e1fe253a7c Implemented localized package loading based on trying to find the package located under "<ContentRoot>/L10N/<CultureCode>/<OriginalPackagePath>". The localized package content subdirectories are also filtered out of the content browser views. In the editor, package paths are not redirected in any additional manner, but outside the editor the package paths redirect to the calculated localized package location.
[CL 2636232 by Saul Abreu in Main branch]
2015-07-28 18:21:55 -04:00
Bob Tellez
b3b6ef475f Checking in Mikolaj Sieluzycki's change to fix up callsites to ask for the value of an enum entry instead of the index. The value and the index are the same unless the enum specified element values in its declaration (i.e. enum MyEnum { FirstValue = 1 })
[CL 2634487 by Bob Tellez in Main branch]
2015-07-27 16:26:39 -04:00
Jamie Dale
9925f7fa07 Fixed newly added collections losing their selection state once you name them
UE-18995 - New Collections that are renamed dont focus the renamed collection

[CL 2632319 by Jamie Dale in Main branch]
2015-07-24 11:43:16 -04:00
Robert Manuszewski
3bcc864c3d Added support for loading cooked content in editor.
#codereview Daniel.Lamb

[CL 2632031 by Robert Manuszewski in Main branch]
2015-07-24 05:57:33 -04:00
Michael Noland
4d453fbce7 Content Browser: Fixed a bug where filters using the default category could still end up with more than one category instance in the menu
[CL 2626703 by Michael Noland in Main branch]
2015-07-20 17:26:51 -04:00
Richard TalbotWatkin
080b1016b6 Back out changelist 2625724
[CL 2625925 by Richard TalbotWatkin in Main branch]
2015-07-20 11:16:15 -04:00
Richard TalbotWatkin
1e4b7565e1 Removed FDeferredMessageLog. Added concept of 'unseen messages' to IMessageLog. Opened assets now automatically open the message log if they encounter load errors.
#jira UE-18229 - Opening an asset that has load warnings does not pop up the Message Log

[CL 2625724 by Richard TalbotWatkin in Main branch]
2015-07-20 09:01:53 -04:00
Jamie Dale
916eb7fbf7 Improved the behavior of Ctrl+B in the Content Browser and Persona
Ctrl+B in the Content Browser will now invoke the "Show in Folder View" command to allow you to easily sync to the actual location of an asset in the cases where you're viewing it via a search or a collection.

Ctrl+B in the Persona animation sequence browser will now invoke the "Find in Content Browser" command.

Ctrl+B will no longer do anything when Persona has no asset available for a given edit mode.

[CL 2619988 by Jamie Dale in Main branch]
2015-07-14 08:57:01 -04:00
Jamie Dale
af36c850ee Fixed crash when shutting down the editor
UE-18403 - Crash occurs exiting the editor with Collections visible

The SCC provider would be nulled out when the SCC module is unloaded, which was triggering a notification to update the collection item states, however the collection manager module had also been unloaded by the time that was being processed, leading to an assert.

This change makes sure that the collection manager module is still available before attempting to use it to update the collection item states.

[CL 2616559 by Jamie Dale in Main branch]
2015-07-10 09:03:02 -04:00
Jamie Dale
90630176ef Dynamic collections can now be referenced in the Content Browser text filters
UETOOL-332 - Collections 2.0
UETOOL-401 - Add support for dynamic collections

You can now reference both static and dynamic collections in the Content Browser text filter, including recursive references (the evaluator guards against cyclic collection references).

The text filter now recursively gathers up any dynamic collection references when the filter text is changed. These are then tested depth first as sub-expressions against each object, to see whether the object is "contained" within the given dynamic collection.

[CL 2615416 by Jamie Dale in Main branch]
2015-07-09 14:24:02 -04:00
Jamie Dale
a245f5992f Fixed the Content Browser search text not updating when the selected dynamic collection is updated
[CL 2615354 by Jamie Dale in Main branch]
2015-07-09 13:37:11 -04:00
Jamie Dale
5d9b323fd3 Now cache out the split path when performing a text filter against an asset
This avoids doing repeated work when a query will perform multiple basic string tests.

[CL 2615061 by Jamie Dale in Main branch]
2015-07-09 10:15:40 -04:00
Jamie Dale
0dfe00d0fc Added support for dynamic collections
UETOOL-332 - Collections 2.0
UETOOL-401 - Add support for dynamic collections

These collections can be created from a text search in the Content Browser, and allow you to store a search query so it can be reused or shared.

They have some limitations compared to static collections:
- As they never know what objects they actually contain, they can't be displayed in the "Collections" list in asset tooltips.
- They cannot contain child collections.

[CL 2615029 by Jamie Dale in Main branch]
2015-07-09 09:59:51 -04:00
Jamie Dale
54336b2e66 Collection "folders" in the asset view now take their color from the collection they represent
UE-18242 - Collections folder icon does not update color in asset view

[CL 2612349 by Jamie Dale in Main branch]
2015-07-07 10:50:52 -04:00
Jamie Dale
85fb8fe67f Added file watchers to detect when collections are changed outside of the collection manager
UE-17782 - Editor must be restarted for New Collections to appear after syncing

These use FFileCache to avoid detecting changes that are made by the collection manager itself.

This also fixes some issues when merging collection sets together, and fixes some places where UI wouldn't update when a collection was changed due to an update or merge.

[CL 2612319 by Jamie Dale in Main branch]
2015-07-07 10:31:39 -04:00
Jamie Dale
d036767342 Made the collections view update lazy
This now queues the list view update until the next Tick to avoid potentially updating the list multiple times per-frame as collection manager updates come in.

[CL 2610951 by Jamie Dale in Main branch]
2015-07-06 09:37:48 -04:00
Steve Robb
7661666dcb Error when a module is both a dependency and dynamically loaded.
Fixes for lots of existing modules by removing all dynamically loaded duplicates (this is probably not the correct solution, but is the safest).

#codereview robert.manuszewski

[CL 2610845 by Steve Robb in Main branch]
2015-07-06 05:46:20 -04:00
Jamie Dale
4db4811f22 Added status information to collections
This shows a little colored pip to the right of the collection items, where each color means:
  Grey   - Up-to-date and empty
  Green  - Up-to-date and not empty
  Blue   - Has local changes
  Orange - Not at the latest revision
  Red    - Checked out by another user, in a conflicted state, or missing its source control provider

This also adds an "Update" and "Save" option to the collections context menu. Typically these won't be needed as collections mostly manage themselves, but since we now show when a collection is out-of-date or dirty, it makes sense to allow the user to take action to correct these states without having to leave the editor.

[CL 2610477 by Jamie Dale in Main branch]
2015-07-03 13:54:34 -04:00