Conflicts:
        src/com/dmdirc/addons/ui_swing/components/TopicBar.java
        src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java
        src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java
        src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java
        src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

Change-Id: Iec6278e7aa84c74fa8a6fea1af2d021f3835b241
Depends-On: Ib0cbe91bec51db7e66d860d65840e784f880e53d
Reviewed-on: http://gerrit.dmdirc.com/3391
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I80f964a049442f6844be240af8394c4018afc282
Reviewed-on: http://gerrit.dmdirc.com/3389
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Id6997978bbe8ce1e03085e7f5e05533019ae6f80
Fixes-Issue: CLIENT-503
Reviewed-on: http://gerrit.dmdirc.com/3388
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I545ec8b6eb97dd2ce0806e47d41de9032426245a
Reviewed-on: http://gerrit.dmdirc.com/3385
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: Icec565349fc41f05eb6f5a9a270aa692b16f7162
Reviewed-on: http://gerrit.dmdirc.com/3384
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: Icde4691b57af7a27b0eaaf82a18d1d7d036d7740
Reviewed-on: http://gerrit.dmdirc.com/3380
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Id79031d5537cd8869e9195f2d944879b79a09f37
Reviewed-on: http://gerrit.dmdirc.com/3379
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Ibd12830dd82d982a1b62d7198942885414bfbe20
Reviewed-on: http://gerrit.dmdirc.com/3369
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: Ibf3d23c723ce7cf8bbd9505b23966fdfdeda8911
Reviewed-on: http://gerrit.dmdirc.com/3334
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

We don't populate this with the new error reporting system.

Change-Id: Ib80c1852cb5e9a627e793ff468723e932dda500d
Reviewed-on: http://gerrit.dmdirc.com/3330
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: I92c8f2d593bb5ab1eca3535761e9ecfb5e2ae3df
Reviewed-on: http://gerrit.dmdirc.com/3325
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I9b37249813c03941cdd410a5b225f3d710a72244
Reviewed-on: http://gerrit.dmdirc.com/3323
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I9028e6f92a6e076a0d446ef2321898924d6faa39
Reviewed-on: http://gerrit.dmdirc.com/3322
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

This is a conversion of all the current swing pref settings to
a new meta-data format. The plan is for the core/plugin system
to be able to parse this and generate the necessary model for
the prefs system.

Change-Id: Iea6e96db79af747c325d66a7d621b4d43b9af177
Reviewed-on: http://gerrit.dmdirc.com/3321
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: If84baaa21a34335cd41e9b06bf4c693889cdfd76
Reviewed-on: http://gerrit.dmdirc.com/3320
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Depends-On: I9e67f7f9fbb479c13ff04fc237f2cb82c08a506c
Change-Id: Ia552a47b40002a346eaeabab3f757ecc32b12b68
Reviewed-on: http://gerrit.dmdirc.com/3317
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I6837cc05a817815a3995647a37f0be105fad8a92
Fixes-Issue: CLIENT-487
Reviewed-on: http://gerrit.dmdirc.com/3316
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Ib286b5917da19bf3ffef1bd22766cd5d15ccbb73
Reviewed-on: http://gerrit.dmdirc.com/3315
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

and some useless fields.

Change-Id: I5a57109dc1b584e96654e4079bcdca1ede24eb2a
Reviewed-on: http://gerrit.dmdirc.com/3314
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Idae726b57047928393f1d5a7055267d92f9a630a
Reviewed-on: http://gerrit.dmdirc.com/3313
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I6c94fe15ba93b64411d4c5d372eaa9201690a59e
Reviewed-on: http://gerrit.dmdirc.com/3312
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I407379d182ec1eb3f7278462e5bbd1786e8d55c6
Reviewed-on: http://gerrit.dmdirc.com/3311
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I97c35e939f99fd6df6dc3da51bcda8c1d5579143
Reviewed-on: http://gerrit.dmdirc.com/3309
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Ib37854e542193ee859cbe30e953e6cb48a1f110e
Reviewed-on: http://gerrit.dmdirc.com/3310
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

This also changes the behaviour of the look and feel and
textpane font and size preferences and they now require a
restart.

Change-Id: I9fee668306493d49d36f4bfc29a8a819bc44eaae
Reviewed-on: http://gerrit.dmdirc.com/3308
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I892219602e96f57e5cba6b5da8f166442354d598
Reviewed-on: http://gerrit.dmdirc.com/3307
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Id1fe8b120f62dcb4329b5816cee230161eaf0496
Reviewed-on: http://gerrit.dmdirc.com/3305
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Fixes-Issue: CLIENT-464
Depends-On: Idf8b7726de5132bf67836b7613ba7fd616f3d414
Change-Id: I7c75a9ecae394fc7ca3052f6aaadea5c0b56f59e
Reviewed-on: http://gerrit.dmdirc.com/3304
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I92864ee7469188f39f7676d6154d622719895f4f
Fixes-Issue: CLIENT-478
Reviewed-on: http://gerrit.dmdirc.com/3302
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I1c786fdaaa2ef16088bf082186f8315a842612af
Reviewed-on: http://gerrit.dmdirc.com/3301
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I0f8402f9988855a9a524aebb874cdaf05dffcc49
Reviewed-on: http://gerrit.dmdirc.com/3300
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: Iaae5269567a3f5a2c9608f6714c6e639e3a6b2f7
Fixes-Issue: CLIENT-468
Reviewed-on: http://gerrit.dmdirc.com/3299
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Ia1f3b158e993542b4a8aee58d343c0cf0c9e181f
Depends-On: Ie936046e8eb98a52a9dff498b4f471c6e19e5697
Reviewed-on: http://gerrit.dmdirc.com/3298
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I9c0f0cc56b11844399b95a19cc855771984d03a0
Depends-On: Iddf8113511c0b8787d182e8f6d856f10beaabd84
Reviewed-on: http://gerrit.dmdirc.com/3296
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Depends-On: Ie4c2dfb2da88679e367d921650dcbce87b9ba328
Change-Id: Ia70524f84070adf62dff7822ac13807eafff499f
Reviewed-on: http://gerrit.dmdirc.com/3293
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Also close CSD when channel closes as with SSD to prevent NPEs.

Change-Id: Iedf19dcecea134db08f33ee14226b8522ecf1843
Reviewed-on: http://gerrit.dmdirc.com/3292
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: I96c7fb7ba00a5d5fd3472806c9915ecdb9bc444f
Reviewed-on: http://gerrit.dmdirc.com/3291
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I0a9ffdb11dfcf13e88c2bce63ca8d68b4d9feed9
Reviewed-on: http://gerrit.dmdirc.com/3290
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

Change-Id: Id9d1b340d1c2472c5b6d7c49f095730795b015d1
Reviewed-on: http://gerrit.dmdirc.com/3289
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: Ib6d8ab0e1eddc5a12d94c2e017cd5d866a3631b5
Reviewed-on: http://gerrit.dmdirc.com/3288
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I2410da37482e1020574dfa55b738ab0e249130ce
Reviewed-on: http://gerrit.dmdirc.com/3287
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: I3a1235a1cda244bc87bbfde5dcd4259e96c52565
Reviewed-on: http://gerrit.dmdirc.com/3286
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: Ic23e4904ada42ac1cb942634d397b002d67eda30
Reviewed-on: http://gerrit.dmdirc.com/3285
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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>

Change-Id: I36bbfd5f067ab32b60ba971a969121556f58a576
Reviewed-on: http://gerrit.dmdirc.com/3282
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: I72b7082ea890e885ca9f0d29cd043b0299d2a5a1
Reviewed-on: http://gerrit.dmdirc.com/3281
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

This also fixes the param mode panel incorrectly using the global config.
Up until now it was using the global config, so only default mode aliases
would have been available, not ircd/network-specific ones.

Fortunately there aren't many param modes...

Change-Id: Ibe0986050b67264238b34abedd95f84afab5e959
Fixes-issue: CLIENT-481
Reviewed-on: http://gerrit.dmdirc.com/3280
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: Ibe411f36d4cfa7942562a437456c73e009b1f195
Depends-On: I7fc1dbbccda16b4c4e51f828f9192bab6a1867ff
Reviewed-on: http://gerrit.dmdirc.com/3278
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

Change-Id: If06484cea112fafe8e75423a1381f484f6d902e5
Reviewed-on: http://gerrit.dmdirc.com/3279
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: I13e0ac51ec3821d586155da610273bcd2e82b278
Depends-On: I7da5409743cd678364dd87a6ebf2629796d5033a
Reviewed-on: http://gerrit.dmdirc.com/3275
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>