Commit Graph

32 Commits

Author SHA1 Message Date
Thomas Sarkanen
be75fe1eca Updated revision display to display strings rather than revision indices
API break: added new pure virtual ISourceControlProvider::UsesChangelists()
API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&)
API break: added new pure virtual ISourceControlRevision::GetRevision()

Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly.

[CL 2411986 by Thomas Sarkanen in Main branch]
2015-01-20 05:48:14 -05:00
Richard TalbotWatkin
79b48fe57e Fix Mac build error caused by CL 2405840.
#codereview Matt.Kuhlenschmidt

[CL 2405856 by Richard TalbotWatkin in Main branch]
2015-01-14 07:50:01 -05:00
Richard TalbotWatkin
045ca38692 Moved Source Control actions button into level toolbar.
#jira UE-1512 - NUX: Move Source Control button somewhere more discoverable

[CL 2405840 by Richard TalbotWatkin in Main branch]
2015-01-14 06:59:46 -05:00
Jamie Dale
a569f6b356 Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.

[CL 2399803 by Jamie Dale in Main branch]
2015-01-07 09:52:40 -05:00
Nick Darnell
90e793745c Slate - ESlateCheckBoxState has been renamed to ECheckBoxState.
[CL 2384008 by Nick Darnell in Main branch]
2014-12-10 14:24:09 -05:00
Richard TalbotWatkin
9857379fb9 Fixed resizable source control submit widget on Mac.
#jira UE-6004 - Submit Files window cannot be resized, can cut off paths

[CL 2383461 by Richard TalbotWatkin in Main branch]
2014-12-10 10:07:46 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Richard TalbotWatkin
5817c35ebe Made Source Control Submit window user-resizable.
#jira UE-6004 - Submit Files window cannot be resized, can cut off paths

[CL 2374575 by Richard TalbotWatkin in Main branch]
2014-12-03 04:26:39 -05:00
Richard TalbotWatkin
885836511e Made Error message in submit to source control dialog stand out more.
#jira UE-5758 - "Submit Files" dialog doesn't explain why the "Ok" button is disabled

[CL 2374540 by Richard TalbotWatkin in Main branch]
2014-12-03 02:58:15 -05:00
Jamie Dale
e856661aed Fixed code relying on SLATE_TEXT_ATTRIBUTE for SHeaderRow::FColumn
Made sure everything was using FText rather than FString.

[CL 2370913 by Jamie Dale in Main branch]
2014-11-26 12:46:05 -05:00
Richard TalbotWatkin
cec2305ea1 Config files are now presented in the "Check in files" dialog along with package files.
#jira UE-5250 - Submit to Source Control does not see edited project settings
#reviewedby Matt.Kuhlenschmidt

[CL 2364638 by Richard TalbotWatkin in Main branch]
2014-11-19 03:23:44 -05:00
Wes Hunt
31e2bb00ac Removed a bunch of stuff from Slate standard include, created SlateBasics.h
* Moved Slate.h into SlateBasics.h and began shifting less commonly used headers into SlateExtras.h.
* Slate.h now simply includes SlateBasics.h and SlateExtras.h.
* Slate.h includes a deprecated warning now to indicate that SlateBasics.h + specific includes should be used instead.
* Moved dozens of inlined functions using Slate widgets into .cpp files to avoid header dependencies.
* All code samples now include SlateBasics.h and SlateExtras.h so future shifts will not break most those projects, but not trigger the deprecation warning of including Slate.h.
#BUN

[CL 2329610 by Wes Hunt in Main branch]
2014-10-14 22:50:06 -04:00
Jamie Dale
c218e7a060 Added a tooltip to show multi-line descriptions in the source control history
TTP# 346882 - EDITOR: Source Control history only shows first line of description

#codereview Max.Preussner

[CL 2309751 by Jamie Dale in Main branch]
2014-09-25 10:21:17 -04:00
Mark Satterthwaite
1f0d83fb44 Fix a memory corruption bug in FSourceControlWindows::PromptForRevert - after calling PackageTools::UnloadPackages the UPackage*'s may be invalid if they have been GC'd, so iterate over their names again and only flag those that are still valid.
#codereview michael.trepka, thomas.sarkanen

[CL 2307059 by Mark Satterthwaite in Main branch]
2014-09-23 12:49:41 -04:00
Matt Kuhlenschmidt
74424650c9 Fix crash reverting source control
[CL 2291038 by Matt Kuhlenschmidt in Main branch]
2014-09-09 12:35:19 -04:00
Max Preussner
8717dd9637 Editor: Added details view customization for FDateTime and FTimespan; also some code cleanup
#CodeReview: david.nikdel

[CL 2282244 by Max Preussner in Main branch]
2014-09-02 19:28:15 -04:00
Dan Oconnor
7e5f8ef155 #UE4 quick fix to keep package from showing up when loaded from history
TTP#344630

[CL 2274791 by Dan Oconnor in Main branch]
2014-08-27 14:29:06 -04:00
Jamie Dale
0015c5bd10 Converted the source control commit comment to use a multi-line editable text control
ReviewedBy Thomas.Sarkanen
#codereview Max.Preussner

[CL 2223250 by Jamie Dale in Main branch]
2014-07-18 10:10:04 -04:00
Nick Darnell
2e2dcaa6b2 UMG - ESlateCheckBoxState is now an actual Enum. This required updating a lot of code that was using auto conversion from bool to int. Fixing a lot of issues with garbage collecting and circular references, old button/border widgets will be broken by this checkin. No longer crashing on exit of PIE.
[CL 2111919 by Nick Darnell in Main branch]
2014-06-20 12:37:24 -04:00
Richard TalbotWatkin
cae2251bba Changed all instances of notifications with a "Show Log" hyperlink to be more precise about which log they will open.
#ttp 338544 - EDITOR: Update Notifications "Show Log" to "Show Output Log"
#branch UE4
#change Changed hyperlink text to be more specific in individual instances of FNotificationInfo objects.
#reviewedby Chris.Wood

[CL 2108221 by Richard TalbotWatkin in Main branch]
2014-06-17 12:05:50 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Thomas Sarkanen
e27e005773 Source control copies now integrate/copy instead of Delete + Add
TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)

New API: Added ISourceControlRevision::GetBranchSource.
Made sure the P4 and SVN providers perform integrates/copies so that history is maintained across file copies & moves.
Also fixed SCC icons not refreshing sometimes until source control operation has completed.
Added new branch icon.
Fixed date display in history.
This required some fairly nasty fixup to get it all working within the Editor copy code path, but the majority of the changes are in the source control providers.

reviewed by Andrew.Brown

[CL 2095604 by Thomas Sarkanen in Main branch]
2014-06-05 12:10:47 -04:00
Barnabas McManners
5c9c346ce7 Updated the revert window to use Revert Unchanged Only correctly.
#TTP 334818 - Editor: Source Control: Revert files dialog checkboxes not behaving properly
#branch UE4

#proj Editor.SourceControlWindows

#change Changed the behaviour of the revert window as follows:
Previously:
Clicking revert unchanged only attempted to disable the changed files, all disabling did at this point was to make it seem as if the item was not selected even if it was. This meant that this check box did not fulfil its actual description

Now:
Checking revert unchanged only disables all of the file items as well as the checkbox to enable or disable all of the file items. It then enables the revert button and if pressed it will only send the unchanged files for reversion, this means it fulfills the buttons description.

#change Misc changes: Updated the buttons to use the standardized button layout, and changed "revert files" button to "revert" as this lead to a nicer layout. Added icons to show which of the selected files have been modified.

#reviewedby Thomas.Sarkanen

[CL 2093142 by Barnabas McManners in Main branch]
2014-06-03 10:41:50 -04:00
Thomas Sarkanen
06466ce255 Added CanCheckIn() to ISourceControlProvider
To allow for further abstraction & extension using DVCS systems like Git & Mercurial, we expose a new CanCheckIn() function that is used when determing 'modifed' files to check in.

#github https://github.com/EpicGames/UnrealEngine/pull/151

TTP# 335099 - [GitHub] 151 : Add ISourceControlState::CanCheckIn()

reviewed by Max.Preussner

[CL 2073950 by Thomas Sarkanen in Main branch]
2014-05-15 04:14:04 -04:00
Thomas Sarkanen
8c30db8697 Submit message icon is no longer a 'stop' symbol
Changed the message log direct notify to a custom notification so the icon gets set to something less aggressive (message log uses the 'worst' message on the current log page for the icon).

TTP# 333620 - Editor: Source Control: Error icon displayed when submitting to source control

reviewed by Andrew.Rodham

[CL 2060917 by Thomas Sarkanen in Main branch]
2014-05-01 06:07:37 -04:00