Changes between Version 11 and Version 12 of Help/Dialog/ConflictList


Ignore:
Timestamp:
2011-05-03T02:33:47+02:00 (15 years ago)
Author:
skyper
Comment:

small change

Legend:

Unmodified
Added
Removed
Modified
  • Help/Dialog/ConflictList

    v11 v12  
    88== Showing/Hiding the Conflict List Dialog ==
    99
    10  * Click on the [[Image(source:/trunk/images/dialogs/conflict.png,15)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog.
    11  * Press '''{{{Alt+C}}}''' to show or hide the Conflict List Dialog.
     10* Click on the [[Image(source:/trunk/images/dialogs/conflict.png,15)]] conflict icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog.
     11* Press '''{{{Alt+C}}}''' to show or hide the Conflict List Dialog.
    1212
    1313== Working with the Conflict List Dialog ==
     
    1515[[Image(conflict_list_dialog.png)]] [[BR]]
    1616
    17  * The Conflict List Dialog displays a list of conflicts. The total amount of unresolved conflicts is shown in the header. You can select a conflict by clicking on it.
     17* The Conflict List Dialog displays a list of conflicts. The total amount of unresolved conflicts is shown in the header. You can select a conflict by clicking on it.
    1818
    19  * [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve''' launches the [wiki:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog.
     19* [[Image(source:/trunk/images/dialogs/conflict.png)]] '''Resolve''' launches the [wiki:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict. Double-Click on a conflict in the list also launches the Conflict Dialog.
    2020
    21  * [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for.
    22    - Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png,15)]] '''Zoom to selection''' if the selected element is not visible in the current view.
     21* [[Image(source:/trunk/images/dialogs/select.png)]] '''Select''' selects the objects which the currently selected conflicts have been generated for.
     22 * Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png,15)]] '''Zoom to selection''' if the selected element is not visible in the current view.
    2323
    2424== see also ==