conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
public void Hover(Element element)
{
var sequenceBuilder = new OpenQA.Selenium.Interactions.DefaultActionSequenceBuilder(selenium);
sequenceBuilder.MoveToElement((IWebElement) element.Native);
}
=======
>>>>>>>
public void Hover(Element element)
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled
<<<<<<<
... |
<<<<<<<
// Option: light framework (CF/Silverlight) enabled
=======
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
>>>>>>>
// Option: missing-value detection (*Specified/ShouldSerialize*/Reset*) enabled
// Option: light framework (CF/Silverlight) enabled |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
=======
using System.Linq;
>>>>>>>
using System;
using System.Linq;
using Xamarin.Forms;
<<<<<<<
_dataGridRowTemplate.SetValue(DataGridVie... |
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
{
((Window)Parent).Branches.RefreshEmbedded();
}
#endif
=======
>>>>>>>
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
OnBroadGUI();
else
#endif
=======
if (!HasReposito... |
<<<<<<<
NPath resultPath = null;
Assert.DoesNotThrow(async () => resultPath = await gitInstaller.SetupGitIfNeeded().Task);
=======
var autoResetEvent = new AutoResetEvent(false);
bool? result = null;
NPath? resultPath = null;
Exception ex = null... |
<<<<<<<
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<bool> OnIsBusyChanged;
=======
event Action OnActiveBranchChanged;
event Action OnActiveRemoteChanged;
event Action<bool> OnIsBusyChanged;
>>>>>>>
... |
<<<<<<<
PopupWindow.Open(PopupWindow.PopupViewType.PublishView);
=======
var publishedClicked = GUILayout.Button(PublishButton, Styles.HistoryToolbarButtonStyle);
if (publishedClicked)
{
Publish... |
<<<<<<<
tree = TreeBuilder.BuildTreeRoot(newEntries, entries, entryCommitTargets, foldedTreeEntries, stateChangeCallback, AssetDatabase.GetCachedIcon);
=======
// Remove what got nuked
for (var index = 0; index < entries.Count;)
{
if (!newEntries.Contain... |
<<<<<<<
=======
private bool showLocalBranches = true;
private bool showRemoteBranches = true;
>>>>>>>
<<<<<<<
[NonSerialized] private bool favoritesHasChanged;
[NonSerialized] private List<string> favoritesList;
=======
>>>>>>>
[NonSerialized] private List<string> favori... |
<<<<<<<
=======
if (Repository != null)
{
Repository.CheckBranchCacheEvent(branchUpdateEvent);
}
>>>>>>>
if (Repository != null)
{
Repository.CheckBranchCacheEvent(branchUpdateEvent);
}
<<<<<<<
public ov... |
<<<<<<<
modifiedStatusIcon,
addedStatusIcon,
deletedStatusIcon,
renamedStatusIcon,
=======
activeBranchIcon,
trackingBranchIcon,
favouriteIconOn,
favouriteIconOff,
>>>>>>>
modifiedStatusIcon,
addedStatusIcon,
deletedStatusIcon,
renamedStatusIcon,
activeBranchIcon,
trackingBr... |
<<<<<<<
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<string> OnHeadChanged;
=======
event Action OnActiveBranchChanged;
event Action OnActiveRemoteChanged;
event Action OnRemoteBranchListChanged;
eve... |
<<<<<<<
IProcessManager processManager = null, ITaskManager taskManager = null, NPath nodeJsExecutablePath = null, NPath octorunScript = null)
=======
string authorizationNote = null,
string fingerprint = null,
IProcessManager processManager = null, ITaskManager taskMan... |
<<<<<<<
[SerializeField] private CacheUpdateEvent lastStatusChangedEvent;
[SerializeField] private ChangesTree treeChanges;
[SerializeField] private List<GitStatusEntry> gitStatusEntries;
=======
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
[Serializ... |
<<<<<<<
psi.EnvironmentVariables.Add("OCTOKIT_USER_AGENT", $"{ApplicationInfo.ApplicationSafeName}/{ApplicationInfo.Version}");
=======
psi.WorkingDirectory = pathToOctorunJs.Parent.Parent;
>>>>>>>
psi.WorkingDirectory = pathToOctorunJs.Parent.Parent;
psi.Environmen... |
<<<<<<<
public override bool IsBusy
{
get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }
}
public override void Refresh()
{
base.Refresh();
userSettingsView.Refresh();
gitPathView.Refresh();
}
======... |
<<<<<<<
string cacheDir = PathManager.Inst.GetCachePath(project.FilePath);
string[] cacheFiles = Directory.EnumerateFiles(cacheDir).ToArray();
=======
>>>>>>>
string cacheDir = PathManager.Inst.GetCachePath(project.FilePath);
string[] cacheFiles = Direc... |
<<<<<<<
Logger.Trace("Deleting tempZipPath:\"{0}\"", tempZipExtractPath);
tempZipExtractPath.DeleteIfExists();
})
.Finally((b, exception) => {
=======
Logger.Trace("D... |
<<<<<<<
rect = treeChanges.Render(initialRect, rect, treeScroll,
=======
var treeRenderRect = treeChanges.Render(rect, scroll,
node => { },
>>>>>>>
var treeRenderRect = treeChanges.Render(rect, treeScroll,
node => { }, |
<<<<<<<
using GitHub.Logging;
=======
using System.Runtime.Serialization;
>>>>>>>
using GitHub.Logging;
using System.Runtime.Serialization; |
<<<<<<<
"{0} {1:D} {2} {3} {4:D} {5} {6} {7:D} {8:D} {9}",
=======
"{0} {1:D} {2} {3:D} {4:D} {5:D} {6:D} {7:D} {8:D} {9} {10}",
>>>>>>>
"{0} {1:D} {2} {3} {4:D} {5} {6} {7:D} {8:D} {9} {10}", |
<<<<<<<
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
if (gitExecutablePath != null && gitExecutablePath.FileExists()) // we have a git path
=======
var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath(); ... |
<<<<<<<
public static IFileSystem FileSystem { get { return Environment.FileSystem; } }
public static IProcessEnvironment GitEnvironment { get { return ApplicationManager.GitEnvironment; } }
public static IUsageTracker UsageTracker { get { return ApplicationManager.UsageTracker; } }
p... |
<<<<<<<
private const string PublishViewCreateButton = "Create";
private const string SelectedOwnerLabel = "Owner";
private const string RepositoryNameLabel = "Repository Name";
private const string DescriptionLabel = "Description";
private const string CreatePrivateRepositoryLab... |
<<<<<<<
DateTimeOffset dt;
if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Format,
CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
{
dt = DateTimeOffset.Now;
... |
<<<<<<<
private const string PublishButton = "Publish";
=======
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
>>>>>>>
private const string Publi... |
<<<<<<<
private const string GitInstallBrowseTitle = "Select git binary";
private const string GitInstallPickInvalidTitle = "Invalid Git install";
private const string GitInstallPickInvalidMessage = "The selected file is not a valid Git install. {0}";
private const string GitInstallPickI... |
<<<<<<<
gitExecHasChanged = true;
=======
metricsHasChanged = true;
>>>>>>>
metricsHasChanged = true;
gitExecHasChanged = true;
<<<<<<<
=======
string gitExecPath = null;
string gitExecParentPath = null;
string extension = null;
... |
<<<<<<<
//TODO: This is removed in another branch anyway
//OnInstallPathGUI();
}
Styles.EndInitialStateArea();
return false;
}
=======
OnInstallPathGUI();
}
Styles.E... |
<<<<<<<
[SerializeField] public string title;
[SerializeField] public string pathSeparator = "/";
[SerializeField] public bool displayRootNode = true;
[SerializeField] public bool isCheckable = false;
[SerializeField] public GUIStyle FolderStyle;
[SerializeField] public G... |
<<<<<<<
=======
[NonSerialized] private bool userDataHasChanged;
[NonSerialized] private bool locksHaveChanged;
>>>>>>>
[NonSerialized] private bool locksHaveChanged; |
<<<<<<<
UInt160 issuer = SignatureContract.CreateSignatureRedeemScript(Issuer).ToScriptHash();
return base.GetScriptHashesForVerifying().Union(new[] { issuer }).OrderBy(p => p).ToArray();
=======
UInt160 issuer = Contract.CreateSignatureRedeemScript(Issuer).ToScriptHash();
... |
<<<<<<<
repositoryManager = initRepositoryManager;
repositoryManager.OnCurrentBranchUpdated += RepositoryManager_OnCurrentBranchUpdated;
repositoryManager.OnCurrentRemoteUpdated += RepositoryManager_OnCurrentRemoteUpdated;
repositoryManager.OnRepositoryUpdated += Reposito... |
<<<<<<<
protected override void InitializeEnvironment()
=======
protected override string GetAssetsPath()
>>>>>>>
protected override string GetAssetsPath()
<<<<<<<
private Task SetupUserTracking()
{
var usagePath = System.Environment.GetFolderPath(System.Environm... |
<<<<<<<
=======
public ITask<List<GitLogEntry>> Log()
{
var task = GitClient.Log();
return HookupHandlers(task, false, false);
}
public ITask<GitStatus> Status()
{
var task = GitClient.Status();
return HookupHandlers(task, false)... |
<<<<<<<
private const float SpinnerAnimationDuration = 4f;
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
private const string PullButton = "Pull";
... |
<<<<<<<
repositoryWatcher = new RepositoryWatcher(platform, repositoryPath, dotGitPath, dotGitIndex, dotGitHead, branchesPath, remotesPath, dotGitConfig);
repositoryWatcher.ConfigChanged += OnConfigChanged;
repositoryWatcher.HeadChanged += HeadChanged;
repositoryWatcher.... |
<<<<<<<
[SerializeField] public Rect Margin = new Rect();
[SerializeField] public Rect Padding = new Rect();
[SerializeField] public string title = string.Empty;
[SerializeField] public string pathSeparator = "/";
[SerializeField] public bool displayRootNode = true;
[Ser... |
<<<<<<<
IEnumerable<string> GetDirectories(string path);
=======
IEnumerable<string> GetDirectories(string path);
IEnumerable<string> GetDirectories(string path, string pattern, SearchOption searchOption);
>>>>>>>
IEnumerable<string> GetDirectories(string path);
IEnumerable<st... |
<<<<<<<
lockedFileRowSelectedStyle,
lockedFileRowStyle,
genericTableBoxStyle,
=======
historyDetailsTitleStyle,
historyDetailsMetaInfoStyle,
>>>>>>>
lockedFileRowSelectedStyle,
lockedFileRowStyle,
genericTableBoxStyle,
... |
<<<<<<<
const int chunkSize = 4096; // 4K is optimum
Copy(zipStream, streamWriter, chunkSize, zipEntry.Size, (totalRead, timeToFinish) =>
{
estimatedDuration = timeToFinish;
estimatedDuration... |
<<<<<<<
=======
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
rep... |
<<<<<<<
private const string BadNotificationDelayError = "A delay of {0} is shorter than the default delay and thus would get pre-empted.";
private const string InitializeTitle = "Initialize";
private const string HistoryTitle = "History";
private const string ChangesTitle = "Changes";
... |
<<<<<<<
public void RemoteListTest()
{
var fileSystem = new FileSystem();
var environment = new DefaultEnvironment();
var gitEnvironment = environment.IsWindows
? (IGitEnvironment) new WindowsGitEnvironment(fileSystem, environment)
: n... |
<<<<<<<
public static IEnumerable<GitRemote> GetGitRemoteEntries(this ProcessManager processManager, string workingDirectory)
{
var results = new List<GitRemote>();
var processor = new RemoteListOutputProcessor();
processor.OnRemote += data => results.Add(data);
... |
<<<<<<<
[SerializeField] private GitPathView gitPathView = new GitPathView();
public override void InitializeView(IView parent)
{
base.InitializeView(parent);
gitPathView.InitializeView(this);
}
=======
[SerializeField] private bool metricsEna... |
<<<<<<<
if (ProgressRenderer != null)
ProgressRenderer.DoProgressGUI();
GUILayout.EndVertical();
GUILayout.EndHorizontal();
=======
EditorGUI.BeginDisabledGroup(isBusy);
>>>>>>>
EditorGUI.BeginDisabledGroup(isBusy);
if (Progr... |
<<<<<<<
/// <summary>
/// Add a graphql error
/// </summary>
/// <param name="message"></param>
public void AddError(string message)
{
GraphQLVaildation.Errors.Add(new GraphQLError(message));
}
/// <summary>
/// Check if any GraphQL v... |
<<<<<<<
public bool OnRequestGeolocationPermission(IWebBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback)
=======
public bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId)
>>>>>>>
public bool... |
<<<<<<<
//settings.CefCommandLineArgs.Add("renderer-process-limit", "1");
//settings.CefCommandLineArgs.Add("renderer-startup-dialog", "renderer-startup-dialog");
=======
settings.LogSeverity = LogSeverity.Verbose;
>>>>>>>
//settings.CefCommandLineArgs.Add("renderer-pr... |
<<<<<<<
public void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength)
{
}
=======
public void OnContextCreated(IWebBrowser browserControl, IBrowse... |
<<<<<<<
=======
private readonly BrowserCore browserCore;
>>>>>>>
<<<<<<<
var temp = managedCefBrowserAdapter;
if (temp == null)
=======
// If the control was not rendered yet when we tried to set up the source hook, it may have failed (since it couldn't
//... |
<<<<<<<
public bool IsBrowserInitialized { get; private set; }
public IDialogHandler DialogHandler { get; set; }
=======
>>>>>>>
public IDialogHandler DialogHandler { get; set; } |
<<<<<<<
bool OnRequestGeolocationPermission(IWebBrowser browser, string requestingUrl, int requestId, IGeolocationCallback callback);
=======
bool OnRequestGeolocationPermission(IWebBrowser browserControl, IBrowser browser, string requestingUrl, int requestId);
>>>>>>>
bool OnRequestGeolocati... |
<<<<<<<
/// <summary>
/// Called on the CEF IO thread when a resource load has completed.
/// </summary>
/// <param name="browserControl">The ChromiumWebBrowser control</param>
/// <param name="browser">the browser object</param>
/// <param name="frame">The frame that is... |
<<<<<<<
public int BytesPerPixel { get; set; }
public int NumberOfBytes { get; set; }
=======
public int BytesPerPixel { get; protected set; }
public bool DirtyRectSupport { get; protected set; }
>>>>>>>
public int BytesPerPixel { get; protected set; }
public bool Dirt... |
<<<<<<<
bool IRequestHandler.GetAuthCredentials(IWebBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback)
=======
bool IRequestHandler.GetAuthCredentials(IWebBrowser browserControl, IBrowser browser, IFrame frame, bool isProxy, string ... |
<<<<<<<
public bool OnFileDialog(IWebBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback)
=======
public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode,... |
<<<<<<<
void IWebBrowserInternal.OnFrameLoadStart(string url)
=======
public void OnFrameLoadStart(string url, bool isMainFrame)
>>>>>>>
void IWebBrowserInternal.OnFrameLoadStart(string url, bool isMainFrame)
<<<<<<<
void IWebBrowserInternal.OnFrameLoadEnd(string url)
=======
... |
<<<<<<<
bool OnJSBeforeUnload(IWebBrowser browser, string message, bool isReload, IJsDialogCallback callback);
=======
bool OnJSBeforeUnload(IWebBrowser browserControl, IBrowser browser, string message, bool isReload, out bool allowUnload);
>>>>>>>
bool OnJSBeforeUnload(IWebBrowser browserCon... |
<<<<<<<
using System.Reactive.Concurrency;
using System.Threading;
using System.Windows.Input;
=======
using System.Threading;
>>>>>>>
using System.Reactive.Concurrency;
using System.Threading;
<<<<<<<
using Microsoft.FSharp.Core;
=======
using Splat;
>>>>>>>
using Microsoft.FSharp.Core;
using Splat;
<<<<<<<... |
<<<<<<<
private void RunCommand(object sender, EventArgs e, string helpTopic, Action<SolutionInfo> command)
=======
private void RunCommand(string helpTopic, Action command)
>>>>>>>
private void RunCommand(string helpTopic, Action<SolutionInfo> command)
<<<<<<<
RunCommand(sender,... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
namespace PnP.Core.Model
{
/// <summary>
/// Paged data retrieval can be done using the methods provided via this interface
/// </summary>
internal interface ISupportPaging
{
... |
<<<<<<<
private const String VESSEL_IMMORTAL_TIMER_NAME = "IMMORTAL";
private const int MakeOtherPlayerVesselsImmortalMSInterval = 2000;
=======
private const int MakeOtherPlayerVesselsImmortalMsInterval = 2000;
>>>>>>>
private const String VESSEL_IMMORTAL_TIMER_NAME = "IMMORTAL";
... |
<<<<<<<
=======
public int CheckVesselsToLoadMsInterval = 2500;
public float UpdateScreenMessageInterval = 1f;
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
public override void OnEnabled()
{
base.OnEnabled();
Client.Singleton.Start... |
<<<<<<<
using System;
using System.Collections.Generic;
using LunaClient.Base.Interface;
=======
using System.Diagnostics;
using LunaClient.Base.Interface;
using LunaClient.Utilities;
>>>>>>>
using System;
using System.Collections.Generic;
using LunaClient.Base.Interface;
using LunaClient.Utilities; |
<<<<<<<
#region Constructors
public VesselUpdateSystem() : base()
{
setupTimer(SEND_TIMER_NAME, _updateSendMSInterval);
}
#endregion
=======
>>>>>>>
#region Constructors
public VesselUpdateSystem() : base()
{
setupTimer(SEND_TIM... |
<<<<<<<
//Update the vessel's orbital information from the current position of the rigidbodies
vessel.orbitDriver.TrackRigidbody(vessel.mainBody, 0);
vessel.UpdatePosVel();
=======
>>>>>>>
//Update the vessel's orbital information from the current posi... |
<<<<<<<
if (_visualStateChanged == null) return;
//NOTE: don't use EventsHelper because it will use DynamicInvoke.
try
{
_visualStateChanged(this, e);
}
catch (Exception ex)
{
Platform.Log(LogLevel.Error, ex)... |
<<<<<<<
_recalculate = true;
EventsHelper.Fire(_lutChanged, this, new EventArgs());
=======
DisposeCachedLut();
>>>>>>>
DisposeCachedLut();
EventsHelper.Fire(_lutChanged, this, new EventArgs());
<<<<<<<
#region Properties
/// <summary>
/// The output LUT of the pipeline.
/// </summary>
p... |
<<<<<<<
++Coordinators[viewer]._referenceCount;
return Coordinators[viewer];
=======
DicomImagePlane.InitializeCache();
++coordinator._referenceCount;
return coordinator;
>>>>>>>
++coordinator._referenceCount;
return coordinator;
<<<<<<<
--_referenceCount;
=======
DicomImagePlane... |
<<<<<<<
string encodedServerRelativeUrl = WebUtility.UrlEncode(serverRelativeUrl).Replace("+", "%20");
var apiCall = new ApiCall($"_api/Web/getFileByServerRelativePath(decodedUrl='{encodedServerRelativeUrl}')", ApiType.SPORest);
=======
string encodedServerRelativeUrl = WebUtility.... |
<<<<<<<
=======
// A flag used to note when we call into a blocking command
// handler, but it calls its complete handler immediately -
// _before_ the Dialogue is told to pause. This out-of-order
// problem can lead to the Dialogue being stuck in a paused state.
// To solve t... |
<<<<<<<
Currencies = new string[] { "btc","ltc","doge", "burst" };
maxRoll = 99.999m;
=======
Currencies = new string[] { "btc","ltc","doge" };
maxRoll = 99.99m;
>>>>>>>
Currencies = new string[] { "btc","ltc","doge", "burst" };
maxRoll = 99.99... |
<<<<<<<
private DateTime _lastAlign;
private readonly Dictionary<long, DateTime> _lastWeaponReload = new Dictionary<long, DateTime>();
=======
private DateTime _lastAlign;
>>>>>>>
private DateTime _lastAlign;
private readonly Dictionary<long, DateTime> _lastWeaponReload ... |
<<<<<<<
AutoStart = Settings.Instance.AutoStart;
Disable3D = Settings.Instance.Disable3D;
=======
>>>>>>>
<<<<<<<
close |= window.Html.Contains("This gate is locked!");
=======
// Lag :/
close |= window.Html.Contains("The ... |
<<<<<<<
public bool waitDecline { get; set; }
=======
public bool Disable3D { get; set; }
>>>>>>>
public bool Disable3D { get; set; }
public bool waitDecline { get; set; }
<<<<<<<
waitDecline = false;
=======
Disable3D = false;
>>>>>>>
Disable3D = false;
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.