|
@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
|
26
|
26
|
import com.dmdirc.DMDircMBassador;
|
27
|
27
|
import com.dmdirc.commandline.CommandLineOptionsModule;
|
28
|
28
|
import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
|
|
29
|
+import com.dmdirc.commandline.CommandLineParser;
|
29
|
30
|
import com.dmdirc.events.ClientInfoRequestEvent;
|
30
|
31
|
import com.dmdirc.interfaces.config.AggregateConfigProvider;
|
31
|
32
|
import com.dmdirc.interfaces.ui.AboutDialogModel;
|
|
@@ -65,17 +66,19 @@ public class CoreAboutDialogModel implements AboutDialogModel {
|
65
|
66
|
private List<Developer> otherDevelopers;
|
66
|
67
|
private List<InfoItem> info;
|
67
|
68
|
private List<LicensedComponent> licences;
|
|
69
|
+ private CommandLineParser commandLineParser;
|
68
|
70
|
|
69
|
71
|
@Inject
|
70
|
72
|
public CoreAboutDialogModel(@GlobalConfig final AggregateConfigProvider globalConfig,
|
71
|
73
|
@Directory(CommandLineOptionsModule.DirectoryType.BASE) final Path baseDirectory,
|
72
|
74
|
final ClientInfo clientInfo, final DMDircMBassador eventBus,
|
73
|
|
- final PluginManager pluginManager) {
|
|
75
|
+ final PluginManager pluginManager, final CommandLineParser commandLineParser) {
|
74
|
76
|
this.globalConfig = globalConfig;
|
75
|
77
|
this.baseDirectory = baseDirectory;
|
76
|
78
|
this.clientInfo = clientInfo;
|
77
|
79
|
this.eventBus = eventBus;
|
78
|
80
|
this.pluginManager = pluginManager;
|
|
81
|
+ this.commandLineParser = commandLineParser;
|
79
|
82
|
about = "";
|
80
|
83
|
mainDevelopers = new ArrayList<>();
|
81
|
84
|
otherDevelopers = new ArrayList<>();
|
|
@@ -118,7 +121,9 @@ public class CoreAboutDialogModel implements AboutDialogModel {
|
118
|
121
|
InfoItem.create("Java Default charset",
|
119
|
122
|
Charset.defaultCharset().displayName()),
|
120
|
123
|
InfoItem.create("Client Uptime",
|
121
|
|
- DateUtils.formatDuration((int) clientInfo.getUptime() / 1000)));
|
|
124
|
+ DateUtils.formatDuration((int) clientInfo.getUptime() / 1000)),
|
|
125
|
+ InfoItem.create("Launcher Version",
|
|
126
|
+ commandLineParser.getLauncherVersion().orElse("Unknown")));
|
122
|
127
|
}
|
123
|
128
|
|
124
|
129
|
private List<LicensedComponent> createLicensedComponents() {
|