Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 12:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added logging + activity logging

Browse source
This commit is contained in:
Wayne Chen 2018-09-10 15:06:14 -07:00
parent a8adaff6c1
commit e7616c7d34
8 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/resources/qml/LoginDialog.qml
View file

@ -86,10 +86,11 @@ ModalWindow {
}
}
Component.onDestruction: {
/* var data = {
"action": "userOptedOut"
};
UserActivityLogger.logAction("LoginDialogAction", data); */
print("destroyed");
if (closeButtonVisible && clickedCloseButton) {
var data = {
"action": "opted out"
};
UserActivityLogger.logAction("encourageLoginDialog", data);
}
}
}

23
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -195,22 +195,25 @@ Item {
root.isPassword = true;
}
Image {
id: showPasswordImage
x: parent.width - ((parent.height) * 31 / 23)
y: (parent.height - (parent.height * 16 / 23)) / 2
width: parent.width - (parent.width - (((parent.height) * 31/23)))
height: parent.height * 16 / 23
source: "../../images/eyeOpen.svg"
}
Rectangle {
id: showPasswordHitbox
z: 10
x: parent.width - (parent.height * 31/16)
// x: parent.width - (parent.height * 31/16)
x: passwordField.width - ((passwordField.height) * 31 / 23)
width: parent.width - (parent.width - (parent.height * 31/16))
// width: passwordField.width - (passwordField.width - (((passwordField.height) * 31/23)))
height: parent.height
color: "transparent"
Image {
id: showPasswordImage
// x: passwordField.width - ((passwordField.height) * 31 / 23)
y: (passwordField.height - (passwordField.height * 16 / 23)) / 2
width: passwordField.width - (passwordField.width - (((passwordField.height) * 31/23)))
height: passwordField.height * 16 / 23
source: "../../images/eyeOpen.svg"
}
MouseArea {
id: passwordFieldMouseArea
anchors.fill: parent

2
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -173,7 +173,7 @@ TabletModalWindow {
break
}
}
onDestroy: {
Component.onDestruction: {
var data = {
"action": "userOptedOut"
};

1
interface/resources/qml/windows/ModalFrame.qml
View file

@ -110,6 +110,7 @@ Frame {
glyph: hifi.glyphs.close
size: 23
onClicked: {
window.clickedCloseButton = true;
window.destroy();
}
}

2
interface/resources/qml/windows/ModalWindow.qml
View file

@ -20,6 +20,8 @@ ScrollingWindow {
frame: ModalFrame { }
property bool closeButtonVisible: false
// only applicable for if close button is visible.
property bool clickedCloseButton: false
property int colorScheme: hifi.colorSchemes.light
property bool draggable: false

5
interface/src/Application.cpp
View file

@ -2308,8 +2308,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(checkLoginTimer, &QTimer::timeout, this, []() {
auto accountManager = DependencyManager::get<AccountManager>();
auto dialogsManager = DependencyManager::get<DialogsManager>();
if (!accountManager->isLoggedIn()) {
if (!accountManager->isLoggedIn() && !qApp->isHMDMode()) {
dialogsManager->showLoginDialog();
QJsonObject loginData = {};
loginData["action"] = "login dialog shown";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
}
});
checkLoginTimer->start();

5
interface/src/ui/LoginDialog.cpp
View file

@ -28,6 +28,7 @@
#include "scripting/HMDScriptingInterface.h"
HIFI_QML_DEF(LoginDialog)
Q_LOGGING_CATEGORY(login_dialog, "hifi.login.dialog")
LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
auto accountManager = DependencyManager::get<AccountManager>();
@ -40,6 +41,10 @@ LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
}
LoginDialog::~LoginDialog() {
qCDebug(login_dialog) << "killing";
}
void LoginDialog::showWithSelection()
{
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();

5
interface/src/ui/LoginDialog.h
View file

@ -15,6 +15,9 @@
#define hifi_LoginDialog_h
#include <OffscreenQmlDialog.h>
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(login_dialog)
class QNetworkReply;
@ -27,6 +30,8 @@ public:
LoginDialog(QQuickItem* parent = nullptr);
virtual ~LoginDialog();
static void showWithSelection();
signals:
void handleLoginCompleted();