conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
SceneSystem,
=======
MouseInput,
>>>>>>>
MouseInput,
SceneSystem, |
<<<<<<<
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c45... |
<<<<<<<
inputSource = inputSystem.RequestNewGenericInputSource(Name);
=======
inputSource = MixedRealityToolkit.InputSystem.RequestNewGenericInputSource(Name, sourceType: InputSourceType.Voice);
>>>>>>>
inputSource = inputSystem.RequestNewGenericInputSource(Name, sourceType: Input... |
<<<<<<<
[Obsolete("Use GetDataProvider<T> instead")]
=======
[Obsolete]
>>>>>>>
[Obsolete("Use GetDataProvider<T> instead")]
<<<<<<<
MixedRealityServiceRegistry.RemoveService<T>(serviceInstance, this);
CoreServices.ResetCacheReference(interfaceType);
... |
<<<<<<<
PlayModeTestUtilities.Setup();
=======
TestUtilities.InitializeMixedRealityToolkitAndCreateScenes(true);
TestUtilities.InitializePlayspace();
PlayModeTestUtilities.EnsureInputModule();
>>>>>>>
PlayModeTestUtilities.Setup();
PlayModeTestU... |
<<<<<<<
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new UnityTouchDeviceManager("Unity Touch Device Manager", 10));
=======
AddManager(typeof(IMixedRealityDeviceManager), new... |
<<<<<<<
base.OnEnable();
if (!CheckMixedRealityManager(false))
=======
if (!CheckMixedRealityConfigured(false))
>>>>>>>
base.OnEnable();
if (!CheckMixedRealityConfigured(false)) |
<<<<<<<
/// <summary>
/// Adds the 'Gaze Input' capability to the manifest.
/// </summary>
/// <remarks>
/// This is a workaround for versions of Unity which don't have native support
/// for the 'Gaze Input' capability in its Player Settings preference location.
... |
<<<<<<<
#endregion
#region Private Serialized Fields
[Header("Target Bounding Box")]
[SerializeField]
[Tooltip("Object the app bar is controlling - This object must implement the IBoundsTargetProvider.")]
private MonoBehaviour boundingBox = null;
/// <summary>
... |
<<<<<<<
// Spatial Awareness system configuration
enableSpatialAwarenessSystem = serializedObject.FindProperty("enableSpatialAwarenessSystem");
spatialAwarenessSystemType = serializedObject.FindProperty("spatialAwarenessSystemType");
spatialAwarenessProfile = serializedOb... |
<<<<<<<
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
var pointers = interactionSource.supportsPointing ? RequestPointers(typeof(WindowsMixedRealityController), controllingHand) : null;
=======
IMixedRealityPointer[] pointers = null;
Input... |
<<<<<<<
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
public class MixedRealityControllerMappingProfile : ScriptableObject
=======
[CreateAssetMe... |
<<<<<<<
// Runtime Version:4.0.30319.34003
=======
// Runtime Version:4.0.30319.33440
>>>>>>>
// Runtime Version:4.0.30319.34003
<<<<<<<
/// Looks up a localized string similar to Loading of more items already in process..
/// </summary>
internal static string MobileServiceColl... |
<<<<<<<
[Tooltip("The duration of the teleport in seconds.")]
private float teleportDuration = 0.25f;
/// <summary>
/// The duration of the teleport in seconds.
/// </summary>
public float TeleportDuration
{
get { return teleportDuration; }
... |
<<<<<<<
=======
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string VersionSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.Version.ToString()).ToLowerInvariant();
... |
<<<<<<<
using Microsoft.MixedReality.Toolkit.Core.Attributes;
using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSyste... |
<<<<<<<
private static bool AreApproximatelyEqual(float f0, float f1, float tolerance)
{
return Mathf.Abs(f0 - f1) < tolerance;
}
private static Vector3 GetBackPlateToFrontPlateVector(PressableButton button)
{
var movingButtonVisualsTransform = GetPrivat... |
<<<<<<<
// If the Spatial Awareness system has been selected for initialization in the Active profile, enable it in the project
if (ActiveProfile.IsSpatialAwarenessSystemEnabled)
{
AddManager(typeof(IMixedRealitySpatialAwarenessSystem), Activator.CreateInstance(Active... |
<<<<<<<
#if NETFULL
using System.Transactions;
#else
using System.Data;
#endif
=======
>>>>>>>
<<<<<<<
$@"select * from [{_storage.SchemaName}].Server",
transaction: transaction)
=======
string.Format(@"select * from [{0}].Server with (nolock)", _storage... |
<<<<<<<
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job where Id = @id";
=======
string.Format(@"select InvocationData, StateName, Arguments, CreatedAt from [{0}].Job with (readcommittedlock) where Id = @id", _storage.GetSchemaName());
>>>>>>>
$@"select Invo... |
<<<<<<<
void Remove(Cluster cluster);
void Save(Cluster cluster);
=======
Cluster Update(Cluster cluster);
>>>>>>>
void Remove(Cluster cluster);
Cluster Update(Cluster cluster);
void Save(Cluster cluster); |
<<<<<<<
cmd.SetComputeIntParam(shadeOpaqueShader, "_DebugViewMaterial", debugViewMaterial);
cmd.SetComputeIntParam(shadeOpaqueShader, "_DebugLightingMode", debugLightingMode);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_D... |
<<<<<<<
{}
=======
{
}
protected override void ValidateCommandLine()
{
if (ConfigurationSettings.VcfPath != "-")
{
CheckInputFilenameExists(ConfigurationSettings.VcfPath, "vcf", "--in");
}
CheckInputFilenameExist... |
<<<<<<<
var version = GetDataSourceVersion(fileName);
var reader = new CustomIntervalParser(new FileInfo(fileName),_refNamesDictionary);
using (var writer = new IntervalTsvWriter(_outputDirectory, version ,
_genomeAssembly.ToString(), SaTsvCommon.CustIntervalSchemaVersion, reader.KeyName,
ReportFor.All... |
<<<<<<<
bool EvolveAllPokemonWithEnoughCandy { get; }
bool KeepPokemonsThatCanEvolve { get; }
bool TransferDuplicatePokemon { get; }
bool UseEggIncubators { get; }
int DelayBetweenPokemonCatch { get; }
bool AutomaticallyLevelUpPokemon { get; }
string LevelUpByCPor... |
<<<<<<<
=======
//pokeballs
public int UseGreatBallAboveCp = 750;
public int UseUltraBallAboveCp = 1500;
public int UseMasterBallAboveCp = 2500;
>>>>>>> |
<<<<<<<
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(RegXX), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof... |
<<<<<<<
return Resolver.TryResolveFolder(Path, allowedExtensions, disallowedExtensions);
=======
return Resolver.TryResolveFolder(Path, IsRecursive, allowedExtensions);
>>>>>>>
return Resolver.TryResolveFolder(Path, IsRecursive, allowedExtensions, disallowedExtensions)... |
<<<<<<<
=======
internal override void BeforeRenderDebug()
{
foreach(var asset in bundleState.Assets.Where(a => a.IsLocal))
{
var localPath = asset.LocalPath;
if(localPath.ToLower().EndsWith(".less") || localPath.ToLower().EndsWith(".less.css"))... |
<<<<<<<
private static string[] extensions = new string[] { ".sass", ".scss" };
//private static Regex sassFiles = new Regex(@"(\.sass)|(\.scss)$", RegexOptions.Compiled);
=======
private static string[] extensions = new[] { ".sass", ".scss" };
private static Regex sassFiles = new Rege... |
<<<<<<<
var result = new FileSystemResolver().TryResolveFolder(path, null, null).ToList();
=======
var result = new FileSystemResolver().TryResolveFolder(path, true, null).ToList();
>>>>>>>
var result = new FileSystemResolver().TryResolveFolder(path, true, null, null).... |
<<<<<<<
=======
private string ProcessLess(string file)
{
lock (typeof(CSSBundle))
{
try
{
var dir = Path.GetDirectoryName(file);
currentDirectoryWrapper.SetCurrentDirectory(dir);
var co... |
<<<<<<<
public class JavaScriptBundle: BundleBase<JavaScriptBundle>
{
private const string JS_TEMPLATE = "<script type=\"text/javascript\" {0}src=\"{1}\"></script>";
=======
internal class JavaScriptBundle: BundleBase, IJavaScriptBundle, IJavaScriptBundleBuilder
{
private stati... |
<<<<<<<
BottomNavigationViewTracker _bottomNavigationTracker;
=======
BottomSheetDialog _bottomSheetDialog;
bool _disposed;
>>>>>>>
BottomNavigationViewTracker _bottomNavigationTracker;
BottomSheetDialog _bottomSheetDialog;
bool _disposed;
<<<<<<<
var items = CreateTabList(ShellItem);
var bottom... |
<<<<<<<
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms", "xf")]
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms/design", "d")]
=======
[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms/design", "Xamarin.Forms")]
>>>>>>>
[assembly: XmlnsDefinition("http://xamarin.com/schem... |
<<<<<<<
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
=======
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery;
>>>>>>>
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery; |
<<<<<<<
Layer.BackgroundColor = ColorExtensions.BackgroundColor.CGColor;
=======
_actualView.Layer.BackgroundColor = UIColor.White.CGColor;
>>>>>>>
_actualView.Layer.BackgroundColor = ColorExtensions.BackgroundColor.CGColor;
<<<<<<<
if (_shadowView != null)
{
if (_shadowView.Superview == null ... |
<<<<<<<
using Xamarin.Forms.Controls.GalleryPages.TwoPaneViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.AppThemeGalleries;
using Xamarin.Forms.Controls.GalleryPages.ExpanderGalleries;
using Xamarin.Forms.Controls.GalleryPages.RadioButtonGalleries;
=======
>>>>>>>
using Xamarin.Forms.Controls.GalleryPages.A... |
<<<<<<<
using Xamarin.Forms.Platform.UAP;
using WScrollMode = Windows.UI.Xaml.Controls.ScrollMode;
=======
using UWPApp = Windows.UI.Xaml.Application;
>>>>>>>
using UWPApp = Windows.UI.Xaml.Application;
using Xamarin.Forms.Platform.UAP;
using WScrollMode = Windows.UI.Xaml.Controls.ScrollMode;
<<<<<<<
var gridVie... |
<<<<<<<
=======
[assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.GalleryPages.TwoPaneViewGalleries.HingeAngleLabel), typeof(HingeAngleLabelRenderer))]
[assembly: ExportRenderer(typeof(Issue8801.PopupStackLayout), typeof(Issue8801StackLayoutRenderer))]
>>>>>>>
[assembly: ExportRenderer(typeof(Issue8801.PopupSt... |
<<<<<<<
case LinearItemsLayout listItemsLayout when listItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal:
ScrollViewer.SetHorizontalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? WScrollMode.Auto : WScrollMode.Disabled);
=======
case ItemsLayoutOrientation.Horizontal:
ScrollViewe... |
<<<<<<<
static bool? s_isiOS13OrNewer;
=======
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
>>>>>>>
static bool? s_isiOS13OrNewer;
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
<<<<<<<
internal static bool IsiOS13OrNewer
{
get
{
if (!s_isiOS13OrNewer.H... |
<<<<<<<
//TestBugzilla44596();
//TestBugzilla45702();
}
protected override void OnStart()
{
//TestIssue2393();
}
void TestBugzilla44596()
{
// verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
SetMainPage(new Bugzilla44596SplashPage(() =>
{
... |
<<<<<<<
[Test]
public void MapFailureOnSuccessShouldReturnSuccess()
{
Result<int, string>.Succeed(42, "warn1")
.MapFailure(list => new[] { 42 })
.Match(
ifSuccess: (v, msgs) =>
{
Assert.... |
<<<<<<<
_displayTextBuilder.BuildMarkdownSignature(sh);
return sh;
=======
return Task.FromResult(sh);
>>>>>>>
_displayTextBuilder.BuildMarkdownSignature(sh);
return sh;
<<<<<<<
=======
private string MakeHoverText(IEnumerable<AnalysisValue> valu... |
<<<<<<<
public VariableDef GetParameter(string name) {
if (string.IsNullOrEmpty(name)) {
return null;
}
if (name == _seqParameters?.Name) {
return _seqParameters;
} else if (name == _dictParameters?.Name) {
return _... |
<<<<<<<
/// Looks up a localized string similar to Arbitrary Python expressions can only be evaluated on a thread which is stopped in Python code at a breakpoint or after a step-in or a step-over operation. Only expressions involving global and local variables, object field access, and indexing of built-in co... |
<<<<<<<
using System.Text;
using System.Threading;
using System.Threading.Tasks;
=======
>>>>>>>
using System.Text;
using System.Threading;
using System.Threading.Tasks;
<<<<<<<
using NativeMethods = Microsoft.VisualStudioTools.Project.NativeMethods;
using Task = System.Threading.Tasks.Task;
=======
>>>>>>>
usin... |
<<<<<<<
var item = await _ppc.ConsumeAsync();
if (item.CompleteBeforeNext) {
=======
var item = await _ppc.ConsumeAsync();
if (item.IsAwaitable) {
>>>>>>>
var item = await _ppc.ConsumeAsync();
... |
<<<<<<<
/// Looks up a localized string similar to File:.
/// </summary>
public static string PythonNavigateToItemDisplay_FileHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_FileHeader", resourceCulture);
}
}
... |
<<<<<<<
/// Looks up a localized string similar to Execute File in P&ython Interactive.
/// </summary>
public static string ExecuteInReplCommand_ExecuteFile {
get {
return ResourceManager.GetString("ExecuteInReplCommand_ExecuteFile", resourceCulture);
... |
<<<<<<<
=======
private readonly int _cmdId;
private readonly InterpreterConfiguration _config;
>>>>>>>
<<<<<<<
=======
_config = config;
>>>>>>>
<<<<<<<
// Use the factory or command line passed as an argument.
IPythonInterpreterFactory factory = null;
=====... |
<<<<<<<
private readonly PythonInteractiveOptions _interactiveOptions;
internal readonly Dictionary<IPythonInterpreterFactory, InterpreterOptions> _interpreterOptions = new Dictionary<IPythonInterpreterFactory, InterpreterOptions>();
private readonly SuppressDialogOptions _suppressDialogOptions;... |
<<<<<<<
State = post.GetState(isDraft),
=======
EnableComments = post.EnableComments,
CloseCommentsAfterDays = post.CloseCommentsAfterDays,
State = GetState(post, isDraft),
>>>>>>>
EnableComments = post.EnableComments,
Cl... |
<<<<<<<
public RepositoryHooks<Alias> Alias { get; } = new RepositoryHooks<Alias>();
=======
public ServiceHooks<Alias> Alias { get; private set; } = new ServiceHooks<Alias>();
/// <summary>
/// Gets the hooks available for comments.
/// </summary>
public ValidationSer... |
<<<<<<<
[Serializable]
public abstract class PostBase : RoutedContent, IBlockModel, IMeta
=======
public abstract class PostBase : RoutedContent, IBlockModel, IMeta, ICommentModel
>>>>>>>
[Serializable]
public abstract class PostBase : RoutedContent, IBlockModel, IMeta, ICommentModel |
<<<<<<<
[Route("folder/delete/{id:Guid}")]
public async Task<IActionResult> DeleteFolder(Guid id)
{
try
{
var folderId = await _service.DeleteFolder(id);
var result = await _service.GetList(folderId);
result.Status = new ... |
<<<<<<<
using Microsoft.Extensions.Hosting;
=======
>>>>>>>
using Microsoft.Extensions.Hosting;
<<<<<<<
app.UseRouting();
app.UseEndpoints(endpoints =>
=======
app.UsePiranhaSummernote();
//app.UsePiranhaTinyMCE();
app.UseMvc(routes =>
>>>>>>>
... |
<<<<<<<
InitPokemons();
InitPokemonMoves();
InitPokemonEvolutions();
InitPlayerCharacter();
=======
InitPokemonItems();
>>>>>>>
InitPokemons();
InitPokemonMoves();
InitPokemonEvolutions();
InitPokemonItems();
InitPlayerCharacter(); |
<<<<<<<
//picture.texture = null; //player sprites not yet implemented.
string playerMoney = string.Empty;
char[] playerMoneyChars = SaveData.currentSave.playerMoney.ToString().ToCharArray();
=======
if(SaveData.currentSave.playerOutfit != "custom") {
picture.texture = Reso... |
<<<<<<<
=======
public enum EncounterTypes
{
Pal_Park, Egg, Hatched, Special_Event, //= 0x0
Tall_Grass, //= 0x2
Plot_Event, //Dialga/Palkia In-Game Event, //= 0x4
Cave, Hall_of_Origin, //= 0x5
Surfing, Fishing, //= 0x7
Building, //= 0x9
Great_Marsh, //(Safari Zone) //=... |
<<<<<<<
//public static UnityEngine.SceneManagement.Scene SceneLoaded = SceneManager.GetActiveScene();
public enum Language
{
/// <summary>
/// US English
/// </summary>
English = 9
}
=======
>>>>>>>
//public static UnityEngine.SceneManagement.Scene SceneLoaded = ... |
<<<<<<<
using System.Text.RegularExpressions;
=======
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
>>>>>>>
using System.Text.RegularExpressions;
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
<<<<<<<
// The regex to apply to the path. If Simplified is ticked, it a patte... |
<<<<<<<
this.userConfigManager = userConfigManager;
Thumbnail = ThumbnailHelper.GetThumbnail(img, userConfigManager.Config.ThumbnailSize);
ImageFormat imageFormat;
ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out im... |
<<<<<<<
private bool isControlKeyDown;
public FDesktop(IEmailer emailer, ImageSaver imageSaver, StringWrapper stringWrapper, AppConfigManager appConfigManager, IErrorOutput errorOutput, IScannedImageFactory scannedImageFactory, RecoveryManager recoveryManager, IScannedImageImporter scannedImageImporter... |
<<<<<<<
=======
#if TESTS
>>>>>>>
<<<<<<<
=======
#else
/// <summary>
/// The dependency container that this controller will use
/// </summary>
public IGameContainer Container { get; set; }
#endif
>>>>>>> |
<<<<<<<
Actor.FromProducer(() => new EndpointManager());
=======
Actor.FromProducer(() => new EndpointManager())
.WithMailbox(() => new DefaultMailbox(new UnboundedMailboxQueue(), new UnboundedMailboxQueue()));
>>>>>>>
Actor.FromProducer(() => new E... |
<<<<<<<
var actor = Actor.FromFunc(c =>
{
if (c.Headers.ContainsKey("TraceID"))
{
Console.WriteLine($"TraceID = {c.Headers.GetOrDefault("TraceID")}");
Console.Writ... |
<<<<<<<
using React.Models;
=======
using Microsoft.AspNetCore.Mvc;
>>>>>>>
using React.Models; |
<<<<<<<
using BurningKnight.entity.component;
using BurningKnight.entity.events;
using Lens.entity;
=======
using BurningKnight.assets.particle;
using BurningKnight.assets.particle.controller;
using BurningKnight.assets.particle.renderer;
using BurningKnight.ui.editor;
>>>>>>>
using BurningKnight.entity.component;
u... |
<<<<<<<
} else if (t.Matches(TileFlags.WallLayer) && (IsInside(index + width) && !((Tile) Tiles[index + width]).Matches(Tile.WallA, Tile.WallB))) {
var pos = new Vector2(x * 16, y * 16 + 8);
Graphics.Render(t == Tile.WallA ? Tileset.WallA[CalcWallIndex(x, y)] : Tileset.WallB[CalcWallIndex(x, y)], po... |
<<<<<<<
var m = currentPlaying;
Tween.To(v, m.Volume, x => m.Volume = x, CrossFadeTime);
=======
Tween.To(musicVolume, currentPlaying.Volume, x => currentPlaying.Volume = x, CrossFadeTime);
>>>>>>>
var m = currentPlaying;
Tween.To(musicVolume, m.Volume, x => m.Volume = x, CrossFadeTime);
<<<<<<... |
<<<<<<<
comboBox.Text = " ~ s gui.cs master ↑10";
#endif
=======
comboBox.Text = gitString;
>>>>>>>
comboBox.Text = gitString;
#endif |
<<<<<<<
=======
_capslock,
_numlock,
_scrolllock,
font
>>>>>>> |
<<<<<<<
try
=======
var activeWindow = Pres.Application.ActiveWindow;
var tempName = Pres.Name.GetHashCode().ToString();
string tempFolderPath = Path.GetTempPath() + TempFolderNamePrefix + tempName + @"\";
if (Directory.Exists(tempFolderPath))
... |
<<<<<<<
public string GetPositionsLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.PositionsLab.PositionsLabButtonLabel;
}
=======
public string GetResizeLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.ResizeLa... |
<<<<<<<
=======
# region Tab Labels
public const string PowerPointLabsAddInsTabLabel = "PowerPointLabs";
# endregion
# region Button Labels
public const string CombineShapesLabel = "Combine Shapes";
public const string AutoAnimateGroupLabel = "Auto Animate";
p... |
<<<<<<<
private bool IsChangeIconKeyPressed()
{
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
return true;
}
else
{
return false;
}
}
=======
private ... |
<<<<<<<
=======
var recorder = recorderPane.Control as RecorderTaskPane;
if (recorder == null)
{
return;
}
>>>>>>>
var recorder = recorderPane.Control as RecorderTaskPane;
if (recorder == null)
{
r... |
<<<<<<<
using Media = System.Windows.Media;
=======
>>>>>>>
<<<<<<<
var origin = Graphics.GetCenterPoint(_refPoint);
foreach (var currentShape in _shapesToBeRotated)
{
PositionsLabMain.Rotate(currentShape, origin, angle, PositionsLabMain.ReorientShapeOrientation... |
<<<<<<<
LoadThemePanel();
=======
if (PowerPointCurrentPresentationInfo.SlideCount > 0)
{
Microsoft.Office.Core.ThemeColorScheme scheme =
PowerPointCurrentPresentationInfo.CurrentSlide.GetNativeSlide().ThemeColorScheme;
... |
<<<<<<<
public const string NoSlideSelectedMessage = "No slide is selected";
public const string OnLoadingMessage = "Now Loading...";
=======
public const string ExplanationItem_IsCallout = "IsCallout";
public const string ExplanationItem_IsCaption = "IsCaption";
public const ... |
<<<<<<<
public bool HasCaptions()
{
foreach (PowerPoint.Shape shape in this.Shapes)
{
if (shape.Name.StartsWith("PowerPointLabs Caption"))
{
return true;
}
}
return false;
}
... |
<<<<<<<
public bool RecorderPaneVisible = false;
=======
public bool _embedAudioVisible = true;
public bool _recorderPaneVisible = false;
>>>>>>>
public bool _embedAudioVisible = true;
public bool _recorderPaneVisible = false;
<<<<<<<
=======
public bool ... |
<<<<<<<
Globals.ThisAddIn.RegisterRecorderPane(currentPresentation);
=======
# region feature: Auto-Narrate Management
public void RecManagementClick(Office.IRibbonControl control)
{
var currentPresentation = Globals.ThisAddIn.Application.ActivePresentation;
... |
<<<<<<<
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorder = Globals.ThisAddIn.ActivateCustomTaskPane.Control as RecorderTaskPane;
=======
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.Recorder... |
<<<<<<<
CacheQueryData = new CacheQueryData();
CacheQueryData.Authority = Authenticator.Authority;
CacheQueryData.Resource = this.Resource;
CacheQueryData.ClientId = this.ClientKey.ClientId;
CacheQueryData.SubjectType = this.TokenSubjectType;
Cach... |
<<<<<<<
public static HDCamera GetHDCamera(Camera camera)
{
// The actual projection matrix used in shaders is actually massaged a bit to work across all platforms (different Z value ranges etc.)
Matrix4x4 projMatrix = GL.GetGPUProjectionMatrix(camera.projectionMatrix, true);
... |
<<<<<<<
NodejsPackage.Instance.CheckSurveyNews(false);
ModulesNode.ReloadHierarchySafe();
=======
SyncFileSystem();
foreach (var group in _refGroupDispenser.Groups) {
group.GenerateReferenceFile();
}
NodejsPackage.Instance.Chec... |
<<<<<<<
private static string CheckForRegistrySpecifiedNodeParams()
{
var paramString = NodejsDialogPage.LoadString(name: "NodeCmdParams", cat: "Debugging");
return paramString;
}
private void StartAndAttachDebugger(string file, string nodePath)
=======
... |
<<<<<<<
//*********************************************************//
// Copyright (c) Microsoft. All rights reserved.
//
// Apache 2.0 License
//
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in ... |
<<<<<<<
using System.Threading;
using System.Threading.Tasks;
using Microsoft.NodejsTools.Debugger.Commands;
using Microsoft.NodejsTools.Debugger.Communication;
using Microsoft.NodejsTools.Debugger.Events;
=======
using System.Net.NetworkInformation;
using System.Text;
using System.Text.RegularExpressions;
>>>>>>>
u... |
<<<<<<<
=======
string testFileAbsolutePath = fileAbsolutePath;
bool typeScriptTest = false;
>>>>>>>
bool typeScriptTest = false; |
<<<<<<<
public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
{
=======
/// <summary>
/// This is the equivalent of "Run Selected Tests" functionality.
/// </summary>
/// <param name="tests">The list of TestCases sel... |
<<<<<<<
public static string NodeExePath => GetPathToNodeExecutableFromEnvironment();
=======
public static Version GetNodeVersion(string path)
{
if (!string.IsNullOrEmpty(path))
{
var versionString = FileVersionInfo.GetVersionInfo(path).ProductVersion;
... |
<<<<<<<
private static async Task<bool> DownloadTypings(
string pathToRootNpmDirectory,
string pathToRootProjectDirectory,
IEnumerable<string> packages,
Redirector redirector) {
=======
private async Task<bool> DownloadTypings(IEnumerable<IPackage> packa... |
<<<<<<<
using Newtonsoft.Json.Linq;
using Raven.Abstractions.MEF;
=======
>>>>>>>
using Raven.Abstractions.MEF; |
<<<<<<<
#if !NET35
=======
/// <summary>
/// Load documents with the specified key prefix
/// </summary>
IEnumerable<T> LoadStartingWith<T>(string keyPrefix, int start = 0, int pageSize = 25);
#if !NET_3_5
>>>>>>>
/// <summary>
/// Load documents with the specified key prefix
/// </summary>
IEnumera... |
<<<<<<<
public JsonDocument[] StartsWith(string keyPrefix, int start, int pageSize, bool metadataOnly = false)
=======
public JsonDocument[] StartsWith(string keyPrefix, string matches, int start, int pageSize)
>>>>>>>
public JsonDocument[] StartsWith(string keyPrefix, string matches, int start, int pageSize, ... |
<<<<<<<
public bool Remove(RavenJToken token)
{
return Items.Remove(token);
}
public void RemoveAt(int index)
{
Items.RemoveAt(index);
}
public void Insert(int index, RavenJToken token)
{
Items.Insert(index, token);
}
public override IEnumerable<T> Values<T>()
{
return Items.Conver... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.