morpheus

commit bddea64ecf824d12cea182517be337e4fb7fb586
parent f254027940a049d291ce170e88194b1b54f4afba
Author: MTRNord <mtrnord1@gmail.com>
Date:   Mon, 21 Aug 2017 20:41:12 +0200

Add Timestamp, add comments and Move UI functions in seperate Package

Diffstat:
M
main.go
 | 
43
-------------------------------------------
A
uis.go
 | 
49
+++++++++++++++++++++++++++++++++++++++++++++++++
M
util/logger.go
 | 
3
+++

3 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/main.go b/main.go
@@ -5,8 +5,6 @@ import (
 	"os"
 
 	"github.com/Nordgedanken/Neo/util"
-	"github.com/therecipe/qt/core"
-	"github.com/therecipe/qt/uitools"
 	"github.com/therecipe/qt/widgets"
 )
 
@@ -33,44 +31,3 @@ func main() {
 	//enter the main event loop
 	widgets.QApplication_Exec()
 }
-
-func NewLoginUI(windowWidth, windowHeight int) *widgets.QWidget {
-	var username string
-	var password string
-	widget := widgets.NewQWidget(nil, 0)
-
-	loader := uitools.NewQUiLoader(nil)
-	file := core.NewQFile2(":/qml/login.ui")
-
-	file.Open(core.QIODevice__ReadOnly)
-	loginWidget := loader.Load(file, widget)
-	file.Close()
-
-	var (
-		ui_inputUsername = widgets.NewQLineEditFromPointer(widget.FindChild("UsernameInput", core.Qt__FindChildrenRecursively).Pointer())
-		ui_inputPassword = widgets.NewQLineEditFromPointer(widget.FindChild("PasswordInput", core.Qt__FindChildrenRecursively).Pointer())
-		ui_SubmitButton  = widgets.NewQPushButtonFromPointer(widget.FindChild("loginButton", core.Qt__FindChildrenRecursively).Pointer())
-	)
-
-	ui_inputUsername.ConnectTextChanged(func(value string) {
-		username = value
-	})
-
-	ui_inputPassword.ConnectTextChanged(func(value string) {
-		password = value
-	})
-
-	ui_SubmitButton.ConnectClicked(func(checked bool) {
-		localLog.Println(username + " - " + password)
-	})
-
-	loginWidget.SetMinimumSize2(windowWidth, windowHeight)
-
-	layout := widgets.NewQVBoxLayout()
-	layout.AddWidget(loginWidget, 0, 0)
-	widget.SetLayout(layout)
-
-	widget.SetWindowTitle("Neo - Login")
-
-	return widget
-}
diff --git a/uis.go b/uis.go
@@ -0,0 +1,49 @@
+package main
+
+import (
+	"github.com/therecipe/qt/core"
+	"github.com/therecipe/qt/uitools"
+	"github.com/therecipe/qt/widgets"
+)
+
+//NewLoginUI initializes the login Screen
+func NewLoginUI(windowWidth, windowHeight int) *widgets.QWidget {
+	var username string
+	var password string
+	widget := widgets.NewQWidget(nil, 0)
+
+	loader := uitools.NewQUiLoader(nil)
+	file := core.NewQFile2(":/qml/login.ui")
+
+	file.Open(core.QIODevice__ReadOnly)
+	loginWidget := loader.Load(file, widget)
+	file.Close()
+
+	var (
+		ui_inputUsername = widgets.NewQLineEditFromPointer(widget.FindChild("UsernameInput", core.Qt__FindChildrenRecursively).Pointer())
+		ui_inputPassword = widgets.NewQLineEditFromPointer(widget.FindChild("PasswordInput", core.Qt__FindChildrenRecursively).Pointer())
+		ui_SubmitButton  = widgets.NewQPushButtonFromPointer(widget.FindChild("loginButton", core.Qt__FindChildrenRecursively).Pointer())
+	)
+
+	ui_inputUsername.ConnectTextChanged(func(value string) {
+		username = value
+	})
+
+	ui_inputPassword.ConnectTextChanged(func(value string) {
+		password = value
+	})
+
+	ui_SubmitButton.ConnectClicked(func(checked bool) {
+		localLog.Println(username + " - " + password)
+	})
+
+	loginWidget.SetMinimumSize2(windowWidth, windowHeight)
+
+	layout := widgets.NewQVBoxLayout()
+	layout.AddWidget(loginWidget, 0, 0)
+	widget.SetLayout(layout)
+
+	widget.SetWindowTitle("Neo - Login")
+
+	return widget
+}
diff --git a/util/logger.go b/util/logger.go
@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 	"sync"
+	"time"
 )
 
 var logInstance *log.Logger
@@ -17,6 +18,7 @@ func Logger() *log.Logger {
 	return logInstance
 }
 
+//StartFileLog initialises the logging function
 func StartFileLog(localLog *log.Logger) {
 	if _, err := os.Stat("./log/"); os.IsNotExist(err) {
 		os.Mkdir("./log/", 0666)
@@ -28,4 +30,5 @@ func StartFileLog(localLog *log.Logger) {
 	defer f.Close()
 
 	localLog.SetOutput(f)
+	localLog.SetPrefix(time.Now().Format("2006-01-02 15:04:05"))
 }