Microsoft Technology Licensing, LLC

Kenneth Lawrence Young

Christian Bernd Schormann

Peter Faraday

Kurt B Jacob

Ahmed Mohamed Metwally

Patrick G Mullen

Bo Zhang

Ido Miles Ben-Shachar

Leonardo Esteban Blanco

Greg D Schechter

Michael John Hillberg

Robert Wilhelm Schmieder

Henry A Sowizral

Ivan J Leichtling

Sriram Subramanian

Namita Gupta

Roy A Leban

Kesavan Shanmugam

Benjamen E Ross

Harikrishna Menon Ajith Kumar

Matthew W Calkins

Shaheeda Parveen Nizar

Michael D Schackwitz

Stephen Matlock

Devon Lyn Strawn

Joseph Stephen Beda

Charles Robert Stoner

Samuel S Wan

Unnikrishnan Ravindranathan

Jeffrey Walter Kelly

Sukvinder S Gill

Elizabeth K Nelson

Matthew David Maddin

Steven Charles White

Michael O Tiano

John Paul Lemire

A first client computing device, including a display and a processor. The processor may execute a distributed source code authoring management system client configured to communicate with a codebase host server. The processor may output a graphical user interface (GUI) of the distributed source code authoring management system client and may receive a first edit to a code file in an editor window included in the GUI. The editor window may provide real-time mark-up of the code file. In response to the first edit, the processor may transmit change set information including the first edit to a codebase host server. The processor may receive, from the codebase host server, a first conflict notification indicating that the first edit and a second edit to the code file have a pending merge conflict. The processor may output the first conflict notification to the display for display in the editor window.

Pending merge conflict notification

A computer device is provided that includes a display and a processor configured to execute an integrated development environment that includes code development tools, output for display on the display an editor window of the integrated development environment configured to present a code file and real-time mark-up of the code file, wherein the editor window includes a difference view mode that causes the editor window to emphasize a difference between the code file and a baseline code file. The processor is further configured to perform a function of one of the code development tools on the code file and present a result of the function in the editor window while in the difference view mode.

Difference view mode for integrated development environments

An active agenda tool is provided that may be executed at one or more networked computing devices. Each connected active agenda tool includes functionality for displaying an agenda interface and for maintaining agenda item timers. The agenda interface includes an agenda and various interactive controls. The agenda includes a plurality of editable agenda items, each having a corresponding agenda item timer maintained by the agenda tool for recording time dedicated to that agenda item during the meeting. Collateral content, which may be shared among the network computing devices, can be associated with one or more of the agenda items. Agenda data representing the displayed agenda items is changed each time a displayed agenda item is modified during the meeting. Any changes to the agenda data may be distributed to each of the networked computing devices, so that each connected agenda tool can update its agenda during the meeting.

Active agenda

A declarative animation system allows a designer to declaratively specify transitory behavior of a user interface or other visual display by recognizing changes in an underlying data model that spans visual elements. A visual display is typically comprised of one or more visual elements, as well as an underlying data model. Although animating within a particular visual element is typically straightforward, moving items across visual elements typically involves sophisticated programming logic. However, using the declarative animation system, visual elements can be associated with an underlying data model in a manner that allows the visual display layer to recognize and respond to changes in the underlying data model. This association can also be leveraged to allow automatically generated animation between visual elements without the addition of custom programmatic code. Thus, the declarative animation system allows designers to specify intuitive, graphically sophisticated interfaces without programming knowledge.

Smooth layout animation of visuals

Tools and techniques support troubleshooting live application visuals, including transient markup expression issues in XAML or HTML. A LADRT module supports troubleshooting without pausing application execution to help inspect and modify visual construct properties, and to identify and alter source code pertaining to a selected visual construct. Changes are serialized back to the application program source code and reflected in real time in the executing application, without a rebuild. Markup annotation preserves pre-evaluation versions of markup expressions for binding, static resource identification, and custom purposes. Markup annotation also correlates visual constructs and source code. The LADRT module operates independently of debuggers, and may autoload with the application. Program project and source code changes are not required for troubleshooting capability.

Troubleshooting visuals and transient expressions in executing applications

Embodiments described herein are directed to automatically generating an animation for a transition between a current state and a new state. In one embodiment, a computer system accesses state properties of a visual element corresponding to a current state the visual element is in and a new state the visual element is to be transitioned to. The state properties include visual properties and transition description information. The computer system determines the differences between the visual properties of the current state and the new state and automatically generates an animation based on the determined differences between the visual properties for the current state and the new state, such that the animation is playable to transition the visual element from the current state to new state.

Visual state manager for control skinning

An editing application may allow a user to change a literal property value of an object in a conventional manner. The functionality of the editing application may be expanded to allow a user to access non-literal values for property values, by allowing the user to define a calculation based on one or more sources. To indicate that an associated property value of an object is a non-literal value, a non-literal cue may be presented to the user, such as through the display of the object, the associated property indicator, and/or the associated property value. To reduce the learning curve of the expanded functionality, the user interface for literal values of a property may remain minimally impacted, while, alternative gestures associated with the object, property indicator, and/or property value may be used to allow access to the non-literal value controls or information.

Blended editing of literal and non-literal values

Combined object level and property level key framing systems, methods, and user interfaces are provided in which a user can enter a mode where any change to a property is recorded as a key framing action (e.g., creation or edit) at the current time as indicated by a timeline. When a key frame is created in this mode, the surrounding object level key frames are inspected to ensure that the functionality that users expect from object level key frames is maintained. If a user explicitly creates an animation of an attribute that spans an object level key frame, then that span for the animation is maintained as the user edits.

Blended object attribute keyframing model

Vector graphics may be flexibly resized. Pins are associated with vector graphics control points, and when a canvas is resized, the pin locations are scaled according to the canvas resizing, and the control points associated with the pin are scaled according to a different positioning scheme. Pins may be fixed in location relative to the pin location, or may scale only in one direction. Control points not associated with a pin are scaled according to the canvas resizing. Other embodiments allow regions to be defined, in which control points are governed by a different positioning scheme, or allow a grid lines to be drawn defining the canvas into slices, where each slice is assigned a specific positioning scheme.

Flexibly resizeable vector graphics

Disclosed are methods for remote users of a collaborative application to generate annotation information, send that annotation information to an application sharer device, and receive back a display combining output of the collaborative application with the annotation information. A collaborative application display is visible on an application viewer's screen. To make an annotation, a user draws over the shared display. The annotation is intercepted and sent to the sharer. On the sharer, the annotation is graphically blended with the display produced by the collaborative application. The combination is then sent to the remote viewers for display. The sharer may visually indicate, via color or a text flag, for example, the source of each annotation. The sharer may time out an annotation, or may delete the annotation if the collaborative application's display has scrolled underneath the annotation, causing the annotation to 'lose its place' in the display and become meaningless.

Methods of annotating a collaborative application display

Described is a method and system in which storyboard objects coordinate the animation of multiple elements and/or media displayed on a computer graphics display. Storyboards relate properties of elements in an element tree to a timeline, such that the properties associated with a storyboard are animated/play together as a group by starting, stopping, seeking or pausing the storyboard. Triggers, such as controlled by user interaction with the displayed information, including property triggers that change values in response to a state change, and event triggers that fire events, may cause the storyboard to start, stop, pause and seek. Storyboards may be used in XAML-based programs, and may be directly associated with elements, or indirectly associated with elements via styles. Complex properties and changeables are supported. Media playback may be controlled via storyboards, and thereby coordinated with other media playback and/or animations.

Coordinating animations and media in computer display output

A desktop publishing software program configured to propagate object content-defining and format-defining object properties so that user-defined object properties automatically propagate to other objects in the document. Object property propagation allows the author of the document to edit a number of linked objects by editing just one of the objects. To enable object property propagation, the desktop publishing software program includes a propagation table for each predefined layout. Each document is constructed from a number of components, and multiple instances of the same component may occur in a document. Each object has a name including an identifier and an instance code. The desktop publishing software program supports the following object property propagation rules, which may be applied to content properties and format properties separately: (1) do not propagate to any other objects; (2) propagate to objects in the same component whose identifiers belong to the same content or format group; (3) propagate to objects in the same document whose identifiers belong to the same content or format group; (4) propagate to objects in other components of the same document with the same identifiers and instance codes; and (5) propagate to objects in the same document whose identifiers belong to the same content or format group and save the object property in a registry so that the object property propagates to other documents as well.

Method and system for propagating object properties in a desktop

A publisher program for automatically changing the layout of content-filled desktop publishing documents. The publisher program allows the author of a document to use a menu-driven utility to define a first layout for the document. A program module known as a Wizard then renders a document in the first layout. The author makes changes to the document while the document is in the first layout, typically by adding content and making author-defined changes to the document rendered by the Wizard. The author may then return to the menu-driven utility to select a second layout for the document. The Wizard renders a document in the second layout and a program module known as a Page Manager automatically applies the author's changes to the document and renders a content-filled document in the second layout.

Desktop publishing software for automatically changing the layout of

A property arithmetic system is provided that can isolate modifications made to one object and apply the modifications to another object. Such isolation and application of modifications are referred to as property arithmetic. The term 'arithmetic' is used as an analogy between computations performed on properties of an object and computations performed on numbers. Using this arithmetic, a user's modifications to the properties of an object can be easily isolated by subtracting the original property values from the modified property values. Once isolated, the modifications can be applied to a different object so that the user does not have to manually recreate their modifications. In the property arithmetic system, properties of an object are stored in a property list. The property list not only contains properties, but can also contain other property lists, which provides flexibility in their use. Furthermore, the property list is stored in a contiguous block of memory. Storing the properties in this manner is advantageous when copying a property list, since the copy typically can be accomplished by a single command, whereas if the property list were stored in noncontiguous areas of memory, multiple commands would be required to copy the property list.

Growing community of inventors

Sammamish, WA, United States of America

Kenneth Lawrence Young