Changes Pane

Last update: Edit

1 Introduction

For version control enabled projects (projects with Team Server or other SVN servers), the Changes pane shows the local changes to the app project since the last commit. You can commit changes, update to the latest revision, and view the history from it.

This pane consists of the following:

  • The top bar contains various buttons, such as Back, Go to, Tasks.
  • The top level shows you a list of documents that were changed, for example, a page where a widget was deleted
  • The zoomed-in level of the pane is split into two grids, with elements in the left grid and changed properties of the selected element in the right grid

2 Top Bar

The top bar of the Changes pane consists of various buttons:

Top Bar of the Changes Pane

Buttons allow you to perform the following actions:

  • Back – takes you back to the top level if you were on the zoomed-in level

  • Go to – opens a zoomed-in level or takes you directly to the changed element

  • Tasks – allows you to perform specific actions such as reverting the change to the latest commit, or solving conflicts

  • Update – retrieves latest changes from the repository, (for more information on the update concept, see the Update section in Version Control)

  • Commit – commits your changes to the repository and starts a new revision (for more information on the commit concept, see the Commit section in Version Control)

  • History – opens the History dialog window that shows the changes made on the current development line of the project (for more information on history, see History)

  • Show Conflicts – available only for a zoomed-in level of a conflicted document, shows details of a conflict

  • Show Changes in mine – available only for a zoomed-in level of a conflicted document, shows changes to a document on a current development line (for more information on how to solve conflicts, see the Dealing With Conflicts section in Using Version Control in Studio Pro)

  • Show Changes in theirs – available only for a zoomed-in level of a conflicted document, shows incoming changes to a document from another development line (for more information on how to solve conflicts, see the Dealing With Conflicts section in Using Version Control in Studio Pro)

  • Show purely visual changes – shows visual changes, such as dragging an entity to a new location in the domain model

3 Top Level

The top level of the Changes pane is a grid listing changed documents, for example, a page or a nanoflow:

Top Level of the Changes Pane

The grid contains information on the following items:

  • Status – shows the type of changes applied to the document. The status can be one of the following:
    • Added – a new document was created; indicated with a green circle
    • Modified – changes to an existing document were made, such as adding or deleting elements or changing element properties; indicated with a yellow circle
    • Deleted – a document was deleted; indicated with a red circle with a minus
    • Conflicted – a document contains conflicting changes; indicated with a red circle with an exclamation mark
  • Item – indicates a name of the changes document
  • Module – a module where the changed document is
  • Details – can contain details on the status, for example, when you have conflicting changes

4 Zoomed-In Level

You can zoom into a changed document, by doing one of the following:

  • Double-click a line in the grid on the top level
  • Click the Go to button
  • Press Enter

To exit the zoomed-in level, click the Back button or press Backspace.

The zoomed-in level is split into two grids, with elements on the left and changed properties on the right. If no properties were changed for an element, for example, when an element was added or deleted, the right grid will be empty:

No Properties to Show

The grid on the left can contain the following columns:

  • Element – the name of the modified element

  • Mine – indicates the status of the change on the current development line

  • Theirs – only displayed for conflicts; indicates the status of the incoming change on another development line

    Left Grid

The grid on the right can contain the following columns:

  • Property – the property that was modified

  • Original – the original property setting

  • Mine – the change to the property that was made on the current development line

  • Theirs – only displayed for conflicts; the change to the property that was made on the another development line

    Rigth Grid

5 Read More