Changes between Version 9 and Version 10 of Help/Dialog/ConflictList


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

updated page

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/ConflictList

    v9 v10  
    11[[TranslatedPages]]
    22= Conflict List Dialog =
     3
     4[[Image(source:/trunk/images/dialogs/conflict.png)]] ''Keyboard shortcut'': '''{{{Alt+Shift+C}}}'''
     5
    36The Conflict List Dialog displays the list of [wiki:/Help/Concepts/Conflict conflicts] in the current data layer.
    47
    58== Showing/Hiding the Conflict List Dialog ==
    69
    7 [[Image(conflict-list-dialog-icon.png)]]
    8  * Click on the following icon in the button column on the left of the JOSM main window to show or hide the Conflict List Dialog
    9  * 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.
    1012
    1113== Working with the Conflict List Dialog ==
    … …  
    1315[[Image(conflict-list-dialog-commented.png)]] [[BR]]
    1416
    15  * The Conflict List Dialog displays a list of conflicts. 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.
    1618
    17  * Click '''Resolve''' to launch the [wiki:/Help/Dialog/Conflict Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict.
     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.
    1820
    19  * Click '''Select''' to select the object which the currently selected conflict has been generated for.
    20    - Use '''View -> ''' [[Image(source:/trunk/images/dialogs/autoscale/selection.png)]] '''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.
    2123
     24== see also ==
     25* [wiki:/Help/Concepts/Conflict Conflict][[BR]]
     26* [wiki:/Help/Dialog/Conflict Conflict Dialog]
    2227
    23 
    24 
    25  
     28----
     29Back to [wiki:/Help/ToggleDialogs Toggle Dialogs][[BR]]
     30Back to [wiki:/Help Main Help]