morpheus

commit 9bb8d52fcc48d2460cd636bcaceb00c15723cedd
parent ebab2b8b8c568db364fd905dafa103ee9caeb581
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 22 Aug 2017 02:45:53 +0200

Prepare Avatar stuff

Diffstat:
M
matrix/ownUser.go
 | 
18
++++++++++++++++++
M
qml/Main.ui
 | 
30
++++++++++++++++++++----------
M
uis.go
 | 
11
++---------
M
util/logger.go
 | 
2
+-

4 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/matrix/ownUser.go b/matrix/ownUser.go
@@ -4,12 +4,30 @@ import (
 	"github.com/matrix-org/gomatrix"
 )
 
+// RespUserDisplayName is the Response type of GetUserDisplayName()
 type RespUserDisplayName struct {
 	DisplayName string `json:"displayname"`
 }
 
+// RespOwnUserAvatar is the Response type of GetUserDisplayName()
+// type RespOwnUserAvatar struct {
+// 	DisplayName string `json:"displayname"`
+// }
+
+// GetUserDisplayName returns the Dispaly name to a MXID
 func GetUserDisplayName(mxid string, cli *gomatrix.Client) (resp *RespUserDisplayName, err error) {
 	urlPath := cli.BuildURL("profile", mxid, "displayname")
 	_, err = cli.MakeRequest("GET", urlPath, nil, &resp)
 	return
 }
+
+// GetOwnUserAvatar returns a *gui.QPixmap of an UserAvatar
+// func GetOwnUserAvatar(cli *gomatrix.Client) *gui.QPixmap {
+// 	avatarURL, avatarErr := cli.GetAvatarURL()
+// 	if avatarErr != nil {
+// 		localLog.Println(avatarErr)
+// 	}
+//
+// 	avatar := gui.NewQPixmap()
+// 	avatar.LoadFromData()
+// }
diff --git a/qml/Main.ui b/qml/Main.ui
@@ -100,16 +100,6 @@
     <string>Titel</string>
    </property>
   </widget>
-  <widget class="QGraphicsView" name="AvatarImage">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>71</width>
-     <height>61</height>
-    </rect>
-   </property>
-  </widget>
   <widget class="QLabel" name="UsernameLabel">
    <property name="geometry">
     <rect>
@@ -149,6 +139,26 @@
     <string>@User:matrix.org</string>
    </property>
   </widget>
+  <widget class="QLabel" name="AvatarLabel">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>71</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Arial</family>
+     <pointsize>31</pointsize>
+     <underline>false</underline>
+    </font>
+   </property>
+   <property name="text">
+    <string>MR</string>
+   </property>
+  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
diff --git a/uis.go b/uis.go
@@ -42,7 +42,7 @@ func NewLoginUI(windowWidth, windowHeight int) *widgets.QWidget {
 		localLog.Println("Starting Login Sequenze")
 		cli, err := matrix.LoginUser(username, password)
 		if err != nil {
-			localLog.Fatalln(err)
+			localLog.Println(err)
 		}
 		MainUI := NewMainUI(windowWidth, windowHeight, cli)
 		MainUI.SetMinimumSize2(windowWidth, windowHeight)
@@ -77,7 +77,7 @@ func NewMainUI(windowWidth, windowHeight int, cli *gomatrix.Client) *widgets.QWi
 	var (
 		usernameLabel = widgets.NewQLabelFromPointer(widget.FindChild("UsernameLabel", core.Qt__FindChildrenRecursively).Pointer())
 		mxidLabel     = widgets.NewQLabelFromPointer(widget.FindChild("MXIDLabel", core.Qt__FindChildrenRecursively).Pointer())
-		//avatarLogo    = widgets.NewQGraphicsViewFromPointer(widget.FindChild("loginButton", core.Qt__FindChildrenRecursively).Pointer())
+		//avatarLogo    = widgets.NewQLabelFromPointer(widget.FindChild("AvatarLabel", core.Qt__FindChildrenRecursively).Pointer())
 	)
 
 	// Set MXID Label
@@ -90,13 +90,6 @@ func NewMainUI(windowWidth, windowHeight int, cli *gomatrix.Client) *widgets.QWi
 	}
 	usernameLabel.SetText(fmt.Sprint(DisplayNameResp.DisplayName))
 
-	//TODO remove after testing
-	avatarURL, avatarErr := cli.GetAvatarURL()
-	if avatarErr != nil {
-		localLog.Println(avatarErr)
-	}
-	localLog.Println("Avatar: " + avatarURL)
-
 	loginWidget.SetMinimumSize2(windowWidth, windowHeight)
 
 	layout := widgets.NewQVBoxLayout()
diff --git a/util/logger.go b/util/logger.go
@@ -26,7 +26,7 @@ func StartFileLog(localLog *log.Logger) (*log.Logger, *os.File) {
 	}
 	f, err := os.OpenFile("./log/Main.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
 	if err != nil {
-		localLog.Fatalf("error opening file: %v", err)
+		localLog.Printf("error opening file: %v", err)
 	}
 
 	mw := io.MultiWriter(os.Stdout, f)