From 42b82f5b29af38d23c5cf4cd2d329c8f25d99806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 18 Dec 2013 22:53:04 +0100 Subject: [PATCH] Added server-address as text to Server-Popup. --- .../Ambient/Screens/PopupScreenServerQR.xml | 30 +++++++++++++++++++ Vocaluxe/Screens/CPopupScreenServerQR.cs | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml index bb9ce46a..94038a48 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml @@ -101,6 +101,36 @@ + + + 640 + 515 + + -2,00 + + 35 + + 300 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + 640 diff --git a/Vocaluxe/Screens/CPopupScreenServerQR.cs b/Vocaluxe/Screens/CPopupScreenServerQR.cs index 73a11a88..47400f17 100644 --- a/Vocaluxe/Screens/CPopupScreenServerQR.cs +++ b/Vocaluxe/Screens/CPopupScreenServerQR.cs @@ -44,11 +44,14 @@ namespace Vocaluxe.Screens private const string _StaticQRWebOS = "StaticQRWebOS"; private const string _StaticQRWindowsPhone = "StaticQRWindowsPhone"; + private const string _TextServerAddress = "TextServerAddress"; + public override void Init() { base.Init(); _ThemeStatics = new string[] { _StaticQRServer, _StaticQRAndroid, _StaticQRSymbian, _StaticQRWebOS, _StaticQRWindowsPhone }; + _ThemeTexts = new string[] { _TextServerAddress }; } public override void LoadTheme(string xmlPath) @@ -60,7 +63,7 @@ namespace Vocaluxe.Screens _Statics[_StaticQRSymbian].Texture = _QRSymbianLink; _Statics[_StaticQRWebOS].Texture = _QRWebOSLink; _Statics[_StaticQRWindowsPhone].Texture = _QRWindowsPhoneLink; - + _Texts[_TextServerAddress].Text = CServer.GetLocalAddress() + ":" + CConfig.ServerPort; } public override bool HandleMouse(SMouseEvent mouseEvent)