echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac OSX Launcher: A lot of bugfixes, refactoring and cleanup.

Browse Source
This commit is contained in:
meeh
2018-09-20 02:38:44 +00:00
parent eb81cadac0
commit 3c0a8cf4ab
9 changed files with 95 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
launchers/macosx/I2PLauncher/userinterface/PopoverViewController.swift
View File

@ -60,7 +60,7 @@ class PopoverViewController: NSViewController {
override func viewWillDraw() {
super.viewWillDraw()
if (RouterStatusView.instance == Optional.none) {
if (RouterStatusView.instance != nil) {
RouterStatusView.instance = self
}
self.setRouterStatusLabelText()
@ -78,16 +78,13 @@ class PopoverViewController: NSViewController {
routerStartStopButton?.target = self
quickControlView?.needsDisplay = true
if (RouterProcessStatus.routerVersion == Optional.none) {
routerVersionLabel?.cell?.stringValue = "Router version: Still unknown"
// trigger a read to ensure values
let tmp = SwiftMainDelegate()
tmp.findInstalledI2PVersion()
if let version = RouterProcessStatus.routerVersion {
routerVersionLabel?.cell?.stringValue = "Router version: " + version
} else {
routerVersionLabel?.cell?.stringValue = "Router version: " + RouterProcessStatus.routerVersion!
routerVersionLabel?.cell?.stringValue = "Router version: Still unknown"
}
if (RouterProcessStatus.routerStartedAt != Optional.none) {
routerUptimeLabel?.cell?.stringValue = "Router has runned for " + DateTimeUtils.timeAgoSinceDate(date: NSDate(date: RouterProcessStatus.routerStartedAt!), numericDates: false)
if let routerStartTime = RouterProcessStatus.routerStartedAt {
routerUptimeLabel?.cell?.stringValue = "Router has runned for " + DateTimeUtils.timeAgoSinceDate(date: NSDate(date: routerStartTime), numericDates: false)
}
}