To add a frame manager, a plugin must export a FrameManagerProvider instance. This will drop users back to using a treeview as their previous config setting will be wrong (it needs to point to the Provider class now), and I don't think it's worth adding migration code given we know of 0 users of the buttonbar. This also enables us to dependency inject the frame managers. Change-Id: Ic66997625587e1adc0ee6ed1c7e38fba31ec47e7 Reviewed-on: http://gerrit.dmdirc.com/3283 Automatic-Compile: DMDirc Build Manager Reviewed-by: Greg Holmes <greg@dmdirc.com>changes/83/3283/2
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
36 |
|
35 |
|
37 |
|
36 |
|
38 |
|
37 |
|
|
|
||
42 |
|
41 |
|
43 |
|
42 |
|
44 |
|
43 |
|
45 |
|
|
|
46 |
|
|
|
47 |
|
44 |
|
48 |
|
45 |
|
49 |
|
46 |
|
|
|
||
111 |
|
108 |
|
112 |
|
109 |
|
113 |
|
110 |
|
|
111 |
|
|
|
112 |
|
|
114 |
|
113 |
|
115 |
|
114 |
|
116 |
|
115 |
|
|
|
||
139 |
|
138 |
|
140 |
|
139 |
|
141 |
|
140 |
|
142 |
|
|
|
143 |
|
|
|
144 |
|
|
|
145 |
|
|
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
|
|
141 |
|
|
|
142 |
|
|
|
143 |
|
|
|
144 |
|
|
|
145 |
|
|
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
151 |
|
151 |
|
152 |
|
152 |
|
153 |
|
153 |
|
|
|
||
158 |
|
158 |
|
159 |
|
159 |
|
160 |
|
160 |
|
|
161 |
|
|
161 |
|
162 |
|
162 |
|
163 |
|
163 |
|
164 |
|
|
|
||
168 |
|
169 |
|
169 |
|
170 |
|
170 |
|
171 |
|
|
172 |
|
|
171 |
|
173 |
|
172 |
|
174 |
|
173 |
|
175 |
|
|
|
||
215 |
|
217 |
|
216 |
|
218 |
|
217 |
|
219 |
|
218 |
|
|
|
219 |
|
|
|
|
220 |
|
|
220 |
|
221 |
|
221 |
|
222 |
|
222 |
|
223 |
|
|
|
||
346 |
|
347 |
|
347 |
|
348 |
|
348 |
|
349 |
|
|
350 |
|
|
349 |
|
351 |
|
350 |
|
|
|
351 |
|
|
|
352 |
|
|
|
353 |
|
|
|
354 |
|
|
|
355 |
|
|
|
356 |
|
|
|
357 |
|
|
|
358 |
|
|
|
359 |
|
|
|
360 |
|
|
|
361 |
|
|
|
362 |
|
|
|
|
352 |
|
|
363 |
|
353 |
|
364 |
|
354 |
|
365 |
|
355 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
|
35 |
|
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
||
423 |
|
424 |
|
424 |
|
425 |
|
425 |
|
426 |
|
|
427 |
|
|
426 |
|
428 |
|
427 |
|
|
|
|
429 |
|
|
428 |
|
430 |
|
429 |
|
431 |
|
430 |
|
|
|
|
432 |
|
|
431 |
|
433 |
|
432 |
|
434 |
|
433 |
|
435 |
|
|
|
||
717 |
|
719 |
|
718 |
|
720 |
|
719 |
|
721 |
|
|
722 |
|
|
|
723 |
|
|
|
724 |
|
|
|
725 |
|
|
|
726 |
|
|
|
727 |
|
|
|
728 |
|
|
|
729 |
|
|
|
730 |
|
|
|
731 |
|
|
720 |
|
732 |
|
|
|
||
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
34 |
|
|
34 |
|
35 |
|
|
36 |
|
|
35 |
|
37 |
|
36 |
|
38 |
|
37 |
|
39 |
|
|
|
||
58 |
|
60 |
|
59 |
|
61 |
|
60 |
|
62 |
|
|
63 |
|
|
61 |
|
64 |
|
62 |
|
65 |
|
63 |
|
66 |
|
64 |
|
67 |
|
65 |
|
|
|
66 |
|
|
|
|
68 |
|
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
71 |
|
|
|
||
80 |
|
82 |
|
81 |
|
83 |
|
82 |
|
84 |
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
88 |
|
|
|
89 |
|
|
|
90 |
|
|
|
91 |
|
|
|
92 |
|
|
83 |
|
93 |
|
84 |
|
94 |
|
85 |
|
95 |
|
|
|
||
88 |
|
98 |
|
89 |
|
99 |
|
90 |
|
100 |
|
91 |
|
|
|
|
101 |
|
|
92 |
|
102 |
|
93 |
|
103 |
|
94 |
|
104 |
|
|
|
||
100 |
|
110 |
|
101 |
|
111 |
|
102 |
|
112 |
|
|
113 |
|
|
|
114 |
|
|
103 |
|
115 |
|
104 |
|
116 |
|
105 |
|
117 |
|
|
|
||
107 |
|
119 |
|
108 |
|
120 |
|
109 |
|
121 |
|
110 |
|
|
|
|
122 |
|
|
111 |
|
123 |
|
112 |
|
124 |
|
113 |
|
125 |
|
|
|
||
118 |
|
130 |
|
119 |
|
131 |
|
120 |
|
132 |
|
121 |
|
|
|
|
133 |
|
|
|
134 |
|
|
|
135 |
|
|
122 |
|
136 |
|
123 |
|
137 |
|
124 |
|
138 |
|
|
139 |
|
|
125 |
|
140 |
|
126 |
|
141 |
|
|
142 |
|
|
|
143 |
|
|
127 |
|
144 |
|
128 |
|
145 |
|
129 |
|
146 |
|
|
|
||
132 |
|
149 |
|
133 |
|
150 |
|
134 |
|
151 |
|
135 |
|
|
|
136 |
|
|
|
137 |
|
|
|
138 |
|
|
|
139 |
|
|
|
140 |
|
|
|
|
152 |
|
|
|
153 |
|
|
141 |
|
154 |
|
142 |
|
155 |
|
143 |
|
156 |
|
144 |
|
157 |
|
145 |
|
158 |
|
146 |
|
159 |
|
|
160 |
|
|
|
161 |
|
|
|
162 |
|
|
|
163 |
|
|
|
164 |
|
|
|
165 |
|
|
147 |
|
166 |
|
148 |
|
167 |
|
149 |
|
168 |
|
|
|
||
219 |
|
238 |
|
220 |
|
239 |
|
221 |
|
240 |
|
|
241 |
|
|
|
242 |
|
|
|
243 |
|
|
|
244 |
|
|
|
245 |
|
|
|
246 |
|
|
|
247 |
|
|
|
248 |
|
|
222 |
|
249 |
|
223 |
|
250 |
|
224 |
|
251 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
27 |
|
26 |
|
28 |
|
27 |
|
29 |
|
28 |
|
|
|
||
42 |
|
41 |
|
43 |
|
42 |
|
44 |
|
43 |
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
44 |
|
54 |
|
45 |
|
55 |
|
46 |
|
|
|
||
|
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 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
|
25 |
|
|
25 |
|
26 |
|
26 |
|
27 |
|
|
28 |
|
|
27 |
|
29 |
|
28 |
|
30 |
|
29 |
|
31 |
|
|
|
||
33 |
|
35 |
|
34 |
|
36 |
|
35 |
|
37 |
|
|
38 |
|
|
36 |
|
39 |
|
37 |
|
40 |
|
38 |
|
41 |
|
|
|
||
53 |
|
56 |
|
54 |
|
57 |
|
55 |
|
58 |
|
|
59 |
|
|
|
60 |
|
|
56 |
|
61 |
|
57 |
|
62 |
|
58 |
|
63 |
|
|
|
||
78 |
|
83 |
|
79 |
|
84 |
|
80 |
|
85 |
|
81 |
|
|
|
|
86 |
|
|
82 |
|
87 |
|
83 |
|
88 |
|
84 |
|
89 |
|
85 |
|
|
|
|
90 |
|
|
86 |
|
91 |
|
87 |
|
|
|
|
92 |
|
|
88 |
|
93 |
|
89 |
|
94 |
|
90 |
|
95 |
|
|
|
||
98 |
|
103 |
|
99 |
|
104 |
|
100 |
|
105 |
|
101 |
|
|
|
102 |
|
|
|
103 |
|
|
|
|
106 |
|
|
104 |
|
107 |
|
105 |
|
108 |
|
|
109 |
|
|
|
110 |
|
|
|
111 |
|
|
|
112 |
|
|
106 |
|
113 |
|
107 |
|
114 |
|
108 |
|
115 |
|
109 |
|
116 |
|
110 |
|
|
|
|
117 |
|
|
|
118 |
|
|
|
119 |
|
|
|
120 |
|
|
|
121 |
|
|
111 |
|
122 |
|
112 |
|
|
|
|
123 |
|
|
|
124 |
|
|
|
125 |
|
|
|
126 |
|
|
|
127 |
|
|
|
128 |
|
|
|
129 |
|
|
|
130 |
|
|
|
131 |
|
|
113 |
|
132 |
|
|
133 |
|
|
|
134 |
|
|
114 |
|
135 |
|
115 |
|
136 |
|
116 |
|
137 |
|
|
|
||
118 |
|
139 |
|
119 |
|
140 |
|
120 |
|
141 |
|
|
142 |
|
|
|
143 |
|
|
|
144 |
|
|
|
145 |
|
|
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
|
151 |
|
|
|
152 |
|
|
|
153 |
|
|
|
154 |
|
|
|
155 |
|
|
|
156 |
|
|
|
157 |
|
|
|
158 |
|
|
|
159 |
|
|
|
160 |
|
|
|
161 |
|
|
121 |
|
162 |
|
122 |
|
163 |
|
123 |
|
164 |
|
|
|
||
156 |
|
197 |
|
157 |
|
198 |
|
158 |
|
199 |
|
159 |
|
|
|
160 |
|
|
|
161 |
|
|
|
|
200 |
|
|
|
201 |
|
|
|
202 |
|
|
|
203 |
|
|
162 |
|
204 |
|
163 |
|
205 |
|
164 |
|
206 |
|
|
|
||
209 |
|
251 |
|
210 |
|
252 |
|
211 |
|
253 |
|
212 |
|
|
|
213 |
|
|
|
214 |
|
|
|
215 |
|
|
|
216 |
|
|
|
217 |
|
|
|
218 |
|
|
|
219 |
|
|
|
220 |
|
|
|
221 |
|
|
|
222 |
|
|
|
223 |
|
|
|
224 |
|
|
|
225 |
|
|
|
226 |
|
|
|
227 |
|
|
|
228 |
|
|
|
229 |
|
|
|
230 |
|
|
|
231 |
|
|
|
232 |
|
|
|
233 |
|
|
|
234 |
|
|
|
235 |
|
|
|
236 |
|
|
|
237 |
|
|
|
238 |
|
|
|
239 |
|
|
|
240 |
|
|
|
241 |
|
|
|
242 |
|
|
|
243 |
|
|
|
244 |
|
254 |
|
245 |
|
255 |
|
246 |
|
256 |
|
|
|
||
363 |
|
373 |
|
364 |
|
374 |
|
365 |
|
375 |
|
366 |
|
|
|
|
376 |
|
|
|
377 |
|
|
367 |
|
378 |
|
368 |
|
379 |
|
369 |
|
380 |
|
|
|
||
568 |
|
579 |
|
569 |
|
580 |
|
570 |
|
581 |
|
571 |
|
|
|
572 |
|
|
|
|
582 |
|
|
573 |
|
583 |
|
574 |
|
584 |
|
575 |
|
|
|
576 |
|
|
|
|
585 |
|
|
577 |
|
586 |
|
578 |
|
587 |
|
579 |
|
588 |
|
|
|
||
|
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 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
|
25 |
|
|
25 |
|
26 |
|
|
27 |
|
|
26 |
|
28 |
|
27 |
|
29 |
|
28 |
|
30 |
|
|
|
||
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
|
51 |
|
|
|
52 |
|
|
49 |
|
53 |
|
50 |
|
54 |
|
51 |
|
55 |
|
|
|
||
73 |
|
77 |
|
74 |
|
78 |
|
75 |
|
79 |
|
76 |
|
|
|
|
80 |
|
|
77 |
|
81 |
|
78 |
|
82 |
|
79 |
|
83 |
|
80 |
|
|
|
|
84 |
|
|
81 |
|
85 |
|
82 |
|
|
|
|
86 |
|
|
83 |
|
87 |
|
84 |
|
88 |
|
|
89 |
|
|
|
90 |
|
|
85 |
|
91 |
|
86 |
|
92 |
|
87 |
|
93 |
|
88 |
|
94 |
|
89 |
|
|
|
|
95 |
|
|
|
96 |
|
|
|
97 |
|
|
|
98 |
|
|
|
99 |
|
|
90 |
|
100 |
|
91 |
|
|
|
|
101 |
|
|
|
102 |
|
|
|
103 |
|
|
|
104 |
|
|
|
105 |
|
|
|
106 |
|
|
|
107 |
|
|
92 |
|
108 |
|
93 |
|
109 |
|
|
110 |
|
|
|
111 |
|
|
|
112 |
|
|
|
113 |
|
|
|
114 |
|
|
|
115 |
|
|
|
116 |
|
|
|
117 |
|
|
|
118 |
|
|
|
119 |
|
|
|
120 |
|
|
|
121 |
|
|
|
122 |
|
|
|
123 |
|
|
|
124 |
|
|
|
125 |
|
|
|
126 |
|
|
|
127 |
|
|
|
128 |
|
|
|
129 |
|
|
|
130 |
|
|
|
131 |
|
|
|
132 |
|
|
94 |
|
133 |
|
95 |
|
134 |
|
96 |
|
135 |
|
|
|
||
127 |
|
166 |
|
128 |
|
167 |
|
129 |
|
168 |
|
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 |
|
169 |
|
156 |
|
170 |
|
157 |
|
171 |
|
|
|
||
310 |
|
324 |
|
311 |
|
325 |
|
312 |
|
326 |
|
313 |
|
|
|
314 |
|
|
|
315 |
|
|
|
|
327 |
|
|
|
328 |
|
|
|
329 |
|
|
|
330 |
|
|
316 |
|
331 |
|
317 |
|
332 |
|
318 |
|
333 |
|
|
|
||
|
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 |
|
|
|
||
48 |
|
48 |
|
49 |
|
49 |
|
50 |
|
50 |
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
51 |
|
54 |
|
52 |
|
55 |
|
53 |
|
56 |
|
54 |
|
57 |
|
55 |
|
58 |
|
56 |
|
59 |
|
|
60 |
|
|
57 |
|
61 |
|
58 |
|
62 |
|
59 |
|
63 |
|
|
|
||
118 |
|
122 |
|
119 |
|
123 |
|
120 |
|
124 |
|
|
125 |
|
|
121 |
|
126 |
|
122 |
|
127 |
|
123 |
|
128 |
|
|
|
||
132 |
|
137 |
|
133 |
|
138 |
|
134 |
|
139 |
|
|
140 |
|
|
135 |
|
141 |
|
136 |
|
142 |
|
137 |
|
143 |
|
|
|
||
176 |
|
182 |
|
177 |
|
183 |
|
178 |
|
184 |
|
|
185 |
|
|
|
186 |
|
|
|
187 |
|
|
|
188 |
|
|
|
189 |
|
|
|
190 |
|
|
|
191 |
|
|
|
192 |
|
|
|
193 |
|
|
|
194 |
|
|
|
195 |
|
|
|
196 |
|
|
|
197 |
|
|
|
198 |
|
|
|
199 |
|
|
|
200 |
|
|
179 |
|
201 |
|