/
mergecontroldialog.xrc
212 lines (212 loc) · 7.07 KB
/
mergecontroldialog.xrc
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
<object class="wxPanel" name="MergeControlDialogMainPanel">
<style>wxTAB_TRAVERSAL</style>
<size>391,187</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>12</border>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>0</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxPanel" name="MapFileSelectors">
<style>wxTAB_TRAVERSAL</style>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>1</option>
<flag>wxEXPAND</flag>
<border>5</border>
<object class="wxFlexGridSizer">
<rows>2</rows>
<cols>3</cols>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>0,2</growablecols>
<growablerows></growablerows>
<object class="sizeritem">
<option>0</option>
<flag>wxBOTTOM</flag>
<border>6</border>
<object class="wxStaticText" name="MergeMapSelector">
<tooltip>The map file to merge into the target map</tooltip>
<label>Map to be merged</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag></flag>
<border>5</border>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxBOTTOM|wxRIGHT</flag>
<border>6</border>
<object class="wxStaticText" name="TargetMapLabel">
<label>Merge Target</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem">
<option>1</option>
<flag>wxEXPAND|wxRIGHT</flag>
<border>0</border>
<object class="wxTextCtrl" name="MergeMapFilename">
<tooltip>The map file to merge into the target map</tooltip>
<value></value>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</flag>
<border>3</border>
<object class="wxStaticBitmap" name="m_bitmap2">
<bitmap stock_id="darkradiant:merge_arrow.png" stock_client="">undefined.png</bitmap>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxTextCtrl" name="TargetMapFilename">
<tooltip>The target map (this is the currently loaded one)</tooltip>
<value></value>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER</flag>
<border>0</border>
<object class="wxPanel" name="BaseMapPanel">
<style>wxTAB_TRAVERSAL</style>
<hidden>1</hidden>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER|wxALL</flag>
<border>0</border>
<object class="wxStaticBitmap" name="m_bitmap1">
<bitmap stock_id="darkradiant:merge_fork.png" stock_client="">undefined.png</bitmap>
</object>
</object>
<object class="sizeritem">
<option>1</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxTextCtrl" name="BaseMapFilename">
<tooltip>A common base map both maps have started from, makes detecting merge conflicts much easier.</tooltip>
<value></value>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxALIGN_CENTER|wxTOP</flag>
<border>6</border>
<object class="wxStaticText" name="BaseMapLabel">
<tooltip>A common base map both maps have started from, makes detecting merge conflicts much easier.</tooltip>
<label>Common Ancestor (optional)</label>
<wrap>-1</wrap>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxBOTTOM|wxEXPAND|wxTOP</flag>
<border>12</border>
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<option>1</option>
<flag>wxRIGHT</flag>
<border>0</border>
<object class="wxButton" name="LoadAndCompareButton">
<label>Load and Compare</label>
<default>0</default>
<markup>0</markup>
<bitmap />
</object>
</object>
<object class="sizeritem">
<option>1</option>
<flag>wxLEFT</flag>
<border>6</border>
<object class="wxButton" name="AbortMergeButton">
<label>Abort Merge</label>
<default>0</default>
<markup>0</markup>
<bitmap />
</object>
</object>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<option>0</option>
<flag>wxALL</flag>
<border>5</border>
<object class="wxStaticText" name="m_staticText14">
<label>Details</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxEXPAND</flag>
<border>0</border>
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<option>1</option>
<flag>wxALL</flag>
<border>0</border>
<object class="wxButton" name="RejectSelectionButton">
<label>Reject selected Modifications</label>
<default>0</default>
<markup>0</markup>
<bitmap />
</object>
</object>
<object class="sizeritem">
<option>1</option>
<flag>wxLEFT</flag>
<border>6</border>
<object class="wxButton" name="FinishMergeButton">
<tooltip>Apply the visible set of changes to the current map and finish the merge operation.</tooltip>
<label>Finish Merge Operation</label>
<default>0</default>
<markup>0</markup>
<bitmap />
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</resource>