- Don't have FrameContainers add themselves to the WindowManager in the constructor. - Don't make FrameContainers keep a reference to WindowManager just to remove themselves when they're closed - Instead have WindowManager register a FrameClosed listener and use that to remove windows itself. Change-Id: Iadbca8a28f7ef3372df7fda722a3cbba2a0fbad6 Depends-On: I0f60ac23438313cab49cdb86c089938f5ee44abc Reviewed-on: http://gerrit.dmdirc.com/2842 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managertags/0.8rc1
|
||
35 | 35 |
|
36 | 36 |
|
37 | 37 |
|
38 |
|
|
39 | 38 |
|
40 | 39 |
|
41 | 40 |
|
|
||
106 | 105 |
|
107 | 106 |
|
108 | 107 |
|
109 |
|
|
110 | 108 |
|
111 | 109 |
|
112 | 110 |
|
113 | 111 |
|
114 | 112 |
|
115 | 113 |
|
116 |
|
|
117 |
|
|
114 |
|
|
118 | 115 |
|
119 | 116 |
|
120 | 117 |
|
121 |
|
|
118 |
|
|
122 | 119 |
|
123 | 120 |
|
124 | 121 |
|
|
||
23 | 23 |
|
24 | 24 |
|
25 | 25 |
|
26 |
|
|
27 | 26 |
|
28 | 27 |
|
29 | 28 |
|
|
||
43 | 42 |
|
44 | 43 |
|
45 | 44 |
|
46 |
|
|
47 |
|
|
48 |
|
|
45 |
|
|
49 | 46 |
|
50 | 47 |
|
51 | 48 |
|
|
||
53 | 50 |
|
54 | 51 |
|
55 | 52 |
|
56 |
|
|
57 | 53 |
|
58 |
|
|
54 |
|
|
59 | 55 |
|
60 | 56 |
|
61 |
|
|
62 |
|
|
63 |
|
|
57 |
|
|
64 | 58 |
|
65 | 59 |
|
66 | 60 |
|
|
||
106 | 106 |
|
107 | 107 |
|
108 | 108 |
|
109 |
|
|
110 |
|
|
111 |
|
|
112 | 109 |
|
113 | 110 |
|
114 | 111 |
|
|
||
117 | 114 |
|
118 | 115 |
|
119 | 116 |
|
120 |
|
|
121 | 117 |
|
122 | 118 |
|
123 | 119 |
|
124 | 120 |
|
125 | 121 |
|
126 |
|
|
127 |
|
|
128 |
|
|
122 |
|
|
129 | 123 |
|
130 | 124 |
|
131 | 125 |
|
|
||
223 | 217 |
|
224 | 218 |
|
225 | 219 |
|
226 |
|
|
227 |
|
|
228 |
|
|
229 |
|
|
230 |
|
|
231 |
|
|
232 |
|
|
233 |
|
|
234 |
|
|
235 |
|
|
236 |
|
|
237 | 220 |
|
238 | 221 |
|
239 | 222 |
|
|
||
323 | 306 |
|
324 | 307 |
|
325 | 308 |
|
326 |
|
|
327 |
|
|
328 | 309 |
|
329 | 310 |
|
330 | 311 |
|
|
||
61 | 61 |
|
62 | 62 |
|
63 | 63 |
|
64 |
|
|
65 | 64 |
|
66 | 65 |
|
67 | 66 |
|
68 | 67 |
|
69 | 68 |
|
70 | 69 |
|
71 |
|
|
72 | 70 |
|
73 | 71 |
|
74 |
|
|
72 |
|
|
75 | 73 |
|
76 | 74 |
|
77 | 75 |
|
78 | 76 |
|
79 | 77 |
|
80 |
|
|
81 |
|
|
82 | 78 |
|
83 | 79 |
|
84 | 80 |
|
|
||
176 | 172 |
|
177 | 173 |
|
178 | 174 |
|
179 |
|
|
180 |
|
|
175 |
|
|
176 |
|
|
177 |
|
|
181 | 178 |
|
179 |
|
|
182 | 180 |
|
183 | 181 |
|
184 | 182 |
|
|
||
25 | 25 |
|
26 | 26 |
|
27 | 27 |
|
28 |
|
|
29 | 28 |
|
30 | 29 |
|
31 | 30 |
|
|
||
45 | 44 |
|
46 | 45 |
|
47 | 46 |
|
48 |
|
|
49 | 47 |
|
50 | 48 |
|
51 | 49 |
|
52 | 50 |
|
53 | 51 |
|
54 |
|
|
55 |
|
|
52 |
|
|
53 |
|
|
56 | 54 |
|
57 | 55 |
|
58 | 56 |
|
|
||
39 | 39 |
|
40 | 40 |
|
41 | 41 |
|
42 |
|
|
43 | 42 |
|
44 | 43 |
|
45 | 44 |
|
|
||
74 | 73 |
|
75 | 74 |
|
76 | 75 |
|
77 |
|
|
78 | 76 |
|
79 | 77 |
|
80 | 78 |
|
81 |
|
|
82 |
|
|
79 |
|
|
83 | 80 |
|
84 | 81 |
|
85 | 82 |
|
86 |
|
|
83 |
|
|
87 | 84 |
|
88 | 85 |
|
89 | 86 |
|
|
||
30 | 30 |
|
31 | 31 |
|
32 | 32 |
|
33 |
|
|
34 | 33 |
|
35 | 34 |
|
36 | 35 |
|
|
||
52 | 51 |
|
53 | 52 |
|
54 | 53 |
|
55 |
|
|
56 | 54 |
|
57 |
|
|
58 |
|
|
55 |
|
|
59 | 56 |
|
60 | 57 |
|
61 |
|
|
58 |
|
|
62 | 59 |
|
63 | 60 |
|
64 | 61 |
|
|
||
240 | 240 |
|
241 | 241 |
|
242 | 242 |
|
243 |
|
|
244 | 243 |
|
245 | 244 |
|
246 | 245 |
|
|
||
567 | 566 |
|
568 | 567 |
|
569 | 568 |
|
570 |
|
|
571 |
|
|
569 |
|
|
572 | 570 |
|
573 | 571 |
|
574 | 572 |
|
|
||
608 | 606 |
|
609 | 607 |
|
610 | 608 |
|
611 |
|
|
609 |
|
|
612 | 610 |
|
613 | 611 |
|
614 | 612 |
|
|
||
668 | 666 |
|
669 | 667 |
|
670 | 668 |
|
671 |
|
|
669 |
|
|
672 | 670 |
|
673 | 671 |
|
674 | 672 |
|
|
||
28 | 28 |
|
29 | 29 |
|
30 | 30 |
|
31 |
|
|
32 | 31 |
|
33 | 32 |
|
34 | 33 |
|
|
||
65 | 64 |
|
66 | 65 |
|
67 | 66 |
|
68 |
|
|
69 | 67 |
|
70 | 68 |
|
71 | 69 |
|
|
||
75 | 73 |
|
76 | 74 |
|
77 | 75 |
|
78 |
|
|
79 | 76 |
|
80 |
|
|
77 |
|
|
81 | 78 |
|
82 | 79 |
|
83 | 80 |
|
|
||
100 | 100 |
|
101 | 101 |
|
102 | 102 |
|
103 |
|
|
103 | 104 |
|
104 |
|
|
105 |
|
|
106 |
|
|
105 | 107 |
|
106 |
|
|
108 |
|
|
109 |
|
|
107 | 110 |
|
108 | 111 |
|
109 | 112 |
|
|
||
67 | 67 |
|
68 | 68 |
|
69 | 69 |
|
70 |
|
|
70 | 71 |
|
71 | 72 |
|
72 | 73 |
|
|
||
25 | 25 |
|
26 | 26 |
|
27 | 27 |
|
28 |
|
|
28 | 29 |
|
29 | 30 |
|
30 | 31 |
|
|
||
50 | 51 |
|
51 | 52 |
|
52 | 53 |
|
54 |
|
|
55 |
|
|
56 |
|
|
53 | 57 |
|
54 | 58 |
|
55 | 59 |
|
|
||
148 | 152 |
|
149 | 153 |
|
150 | 154 |
|
155 |
|
|
156 |
|
|
151 | 157 |
|
152 | 158 |
|
153 | 159 |
|
|
||
186 | 192 |
|
187 | 193 |
|
188 | 194 |
|
195 |
|
|
196 |
|
|
189 | 197 |
|
190 | 198 |
|
191 | 199 |
|
|
||
351 | 359 |
|
352 | 360 |
|
353 | 361 |
|
362 |
|
|
363 |
|
|
364 |
|
|
365 |
|
|
366 |
|
|
367 |
|
|
368 |
|
|
369 |
|
|
370 |
|
|
371 |
|
|
372 |
|
|
373 |
|
|
374 |
|
|
354 | 375 |
|
|
||
27 | 27 |
|
28 | 28 |
|
29 | 29 |
|
30 |
|
|
31 | 30 |
|
32 | 31 |
|
33 | 32 |
|
|
||
43 | 42 |
|
44 | 43 |
|
45 | 44 |
|
46 |
|
|
47 | 45 |
|
48 | 46 |
|
49 | 47 |
|
|
||
61 | 59 |
|
62 | 60 |
|
63 | 61 |
|
64 |
|
|
62 |
|
|
65 | 63 |
|
66 | 64 |
|
67 | 65 |
|
|
||
91 | 89 |
|
92 | 90 |
|
93 | 91 |
|
94 |
|
|
92 |
|
|
95 | 93 |
|
96 | 94 |
|
97 | 95 |
|
|
||
28 | 28 |
|
29 | 29 |
|
30 | 30 |
|
31 |
|
|
32 | 31 |
|
33 | 32 |
|
34 | 33 |
|
|
||
39 | 38 |
|
40 | 39 |
|
41 | 40 |
|
42 |
|
|
41 |
|
|
43 | 42 |
|
44 |
|
|
43 |
|
|
45 | 44 |
|
46 | 45 |
|
47 | 46 |
|