#5639: Warn the user about layer actions not being undoable

codereader · Jun 8, 2021 · ae4fa10 · ae4fa10
1 parent 39290c4
commit ae4fa10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/install/ui/mergecontroldialog.fbp b/install/ui/mergecontroldialog.fbp
@@ -1978,7 +1978,7 @@
                                                         <property name="gripper">0</property>
                                                         <property name="hidden">0</property>
                                                         <property name="id">wxID_ANY</property>
-                                                        <property name="label">Merge Layers</property>
+                                                        <property name="label">Merge Layers (cannot be undone!)</property>
                                                         <property name="max_size"></property>
                                                         <property name="maximize_button">0</property>
                                                         <property name="maximum_size"></property>

diff --git a/install/ui/mergecontroldialog.xrc b/install/ui/mergecontroldialog.xrc
@@ -411,7 +411,7 @@
 												<border>6</border>
 												<object class="wxCheckBox" name="MergeLayers">
 													<tooltip>With this option checked the layers in this map are going to be adjusted to fit the incoming map, i.e. any changes made to layers in the merged map are applied to this map. New layers in the imported map are going to be created here. Layers in this map that are not present in the incoming map will be removed.\nLeave this option unchecked to reject any layer changes from the incoming map, all newly created elements will be placed in the active layer in this case.</tooltip>
-													<label>Merge Layers</label>
+													<label>Merge Layers (cannot be undone!)</label>
 													<checked>0</checked>
 												</object>
 											</object>