Improve GA look and feel

uglide · uglide · commit 4beb5b4a7617 · 2015-10-13T18:05:15.000+03:00
diff --git a/3rdparty/qgamp b/3rdparty/qgamp
@@ -1 +1 @@
-Subproject commit 2e3ef811a1a43429791e37e2b44a7db09fe6b6fa
+Subproject commit 9f6abe3b26305487c078538369bd1d176d07eb3f
diff --git a/src/app/dialogs/connect.cpp b/src/app/dialogs/connect.cpp
@@ -3,6 +3,7 @@
 #include <QFileDialog>
 #include <QFile>
 #include <qredisclient/connection.h>
+#include <googlemp.h>
 #include "app/models/connectionsmanager.h"
 
 ConnectionWindow::ConnectionWindow(QWeakPointer<ConnectionsManager> manager, QWidget *parent)
@@ -36,6 +37,8 @@ ConnectionWindow::ConnectionWindow(QWeakPointer<ConnectionsManager> manager, QWi
     ui.keysPattern->setText(QString(ConnectionConfig::DEFAULT_KEYS_GLOB_PATTERN));
     ui.connectionTimeout->setValue(ConnectionConfig::DEFAULT_TIMEOUT_IN_MS / 1000);
     ui.executionTimeout->setValue(ConnectionConfig::DEFAULT_TIMEOUT_IN_MS / 1000);
+
+    GoogleMP::instance()->showScreen("connection-dialog");
 }
 
 void ConnectionWindow::setConnectionConfig(const ConnectionConfig& config)
diff --git a/src/app/dialogs/mainwindow.cpp b/src/app/dialogs/mainwindow.cpp
@@ -9,6 +9,7 @@
 #include <QDesktopWidget>
 #include <easylogging++.h>
 #include <qredisclient/redisclient.h>
+#include <googlemp.h>
 
 #include "app/models/configmanager.h"
 #include "app/models/connectionsmanager.h"
@@ -201,6 +202,8 @@ void MainWin::OnNewUpdateAvailable(QString &url)
 
 void MainWin::OnImportConnectionsClick()
 {
+    GoogleMP::instance()->showScreen("import-connections");
+
     QString fileName = QFileDialog::getOpenFileName(this, "Import Connections", "", tr("Xml Files and JSON files (*.xml *.json)"));
 
     if (fileName.isEmpty()) {
@@ -211,11 +214,13 @@ void MainWin::OnImportConnectionsClick()
         QMessageBox::information(this, "Connections imported", "Connections imported from connections file");
     } else {
         QMessageBox::warning(this, "Can't import connections", "Select valid file for import");
-    }
+    }       
 }
 
 void MainWin::OnExportConnectionsClick()
 {
+    GoogleMP::instance()->showScreen("export-connections");
+
     QString fileName = QFileDialog::getSaveFileName(this, "Export Connections to JSON", "", tr("Json Files (*.json)"));
 
     if (fileName.isEmpty()) {
diff --git a/src/app/dialogs/quickstartdialog.cpp b/src/app/dialogs/quickstartdialog.cpp
@@ -1,11 +1,14 @@
 #include "quickstartdialog.h"
 #include "ui_quickstartdialog.h"
+#include <googlemp.h>
 
 QuickStartDialog::QuickStartDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::QuickStartDialog)
 {
     ui->setupUi(this);
+
+    GoogleMP::instance()->showScreen("quick-start-dialog");
 }
 
 QuickStartDialog::~QuickStartDialog()
diff --git a/src/modules/console/consoletab.cpp b/src/modules/console/consoletab.cpp
@@ -3,6 +3,7 @@
 #include <QScrollBar>
 #include <QTextBlock>
 #include <QBoxLayout>
+#include <googlemp.h>
 
 #include <qconsole.h>
 
@@ -43,6 +44,8 @@ ConsoleTab::ConsoleTab(QSharedPointer<Operations> operations)
 
     m_initTimer.setSingleShot(true);
     m_initTimer.start(0);
+
+    GoogleMP::instance()->showScreen("redis-console");
 }
 
 void ConsoleTab::close()
diff --git a/src/modules/value-editor/view.cpp b/src/modules/value-editor/view.cpp
@@ -7,18 +7,30 @@
 #include <QApplication>
 #include <QtQml>
 #include <QSysInfo>
+#include <googlemp.h>
 #include "viewmodel.h"
 #include "valueviewmodel.h"
 
 using namespace ValueEditor;
 
+static QObject *analytics_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    GoogleMP *gmp = GoogleMP::instance();
+    return gmp;
+}
+
+
 View::View(QSharedPointer<ViewModel> viewModel)
     : QWidget(), m_qml(nullptr),
       m_binaryUtils(QSharedPointer<BinaryUtils>(new BinaryUtils()))
 {    
     m_qml = QSharedPointer<QQuickWidget>(new QQuickWidget());
 
     qmlRegisterType<ValueViewModel>("rdm.models", 1, 0, "ValueViewModel");
+    qmlRegisterSingletonType<GoogleMP>("MeasurementProtocol", 1, 0, "Analytics", analytics_singletontype_provider);
 
     m_qml->setResizeMode(QQuickWidget::SizeRootObjectToView);
     m_qml->rootContext()->setContextProperty("appVersion", QApplication::applicationVersion());
diff --git a/src/modules/value-editor/viewmodel.cpp b/src/modules/value-editor/viewmodel.cpp
@@ -2,6 +2,7 @@
 #include <QDebug>
 #include <qredisclient/connection.h>
 #include <qredisclient/utils/text.h>
+#include <googlemp.h>
 #include "connections-tree/items/keyitem.h"
 #include "value-editor/valueviewmodel.h"
 
@@ -31,6 +32,8 @@ void ValueEditor::ViewModel::openTab(QSharedPointer<RedisClient::Connection> con
                 removeModel(keyModel);
                 key.setRemoved(); //Disable key in connections tree
             });
+
+            GoogleMP::instance()->showScreen(QString("ValueEditor-%1").arg(keyModel->getType()));
         });
         // TODO: add empty key model for loading
     } catch (...) {
diff --git a/src/resources/images/ga.png b/src/resources/images/ga.png
diff --git a/src/resources/qml/ValueTabs.qml b/src/resources/qml/ValueTabs.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.2
 import QtQuick.Window 2.2
+import MeasurementProtocol 1.0
 import "./editors/editor.js" as Editor
 import "./parts"
 
@@ -52,7 +53,7 @@ Repeater {
 
         Component.onCompleted: {
             keyTab.focus = true
-            keyTab.forceActiveFocus()
+            keyTab.forceActiveFocus()            
         }
 
         Item {
@@ -131,6 +132,8 @@ Repeater {
                         onClicked: {
                             newKeyName.text = keyNameField.text
                             renameConfirmation.open()
+
+                            Analytics.reportEvent("value-editor", "rename-key")
                         }
                     }
 
@@ -154,6 +157,8 @@ Repeater {
 
                         onClicked: {
                             deleteConfirmation.open()
+
+                            Analytics.reportEvent("value-editor", "delete-key")
                         }
                     }
 
@@ -329,7 +334,11 @@ Repeater {
                             Layout.preferredWidth: 150
                             text: "Add row";
                             iconSource: "qrc:/images/add.png"
-                            onClicked: addRowDialog.open()
+                            onClicked: {
+                                addRowDialog.open()
+
+                                Analytics.reportEvent("value-editor", "add-row")
+                            }
 
                             Dialog {
                                 id: addRowDialog
@@ -390,6 +399,8 @@ Repeater {
                                 }
                                 deleteRowConfirmation.rowToDelete = table.currentRow
                                 deleteRowConfirmation.open()
+
+                                Analytics.reportEvent("value-editor", "delete-row")
                             }
 
                             MessageDialog {
@@ -422,6 +433,8 @@ Repeater {
                                     console.log("Reload value in tab")
                                     table.model.reload()
                                     valueEditor.clear()
+
+                                    Analytics.reportEvent("value-editor", "reload-key")
                                 }
                             }
                         }
@@ -528,6 +541,8 @@ Repeater {
 
                                 savingConfirmation.text = "Value was updated!"
                                 savingConfirmation.open()
+
+                                Analytics.reportEvent("value-editor", "update-row")
                             }
 
                         }
diff --git a/src/resources/qml/WelcomeTab.qml b/src/resources/qml/WelcomeTab.qml
@@ -63,7 +63,7 @@ Tab {
                                       + '<a href="http://redisdesktop.com/community">Community</a></span>'}
 
             RichTextWithLinks {
-                Layout.maximumWidth: footerMsg.contentWidth
+                Layout.maximumWidth: topLayout.implicitWidth
                 html: '<span style="font-size: 12px;"><b>Special thanks to:</b> '
                                       + 'andrewjknox, Rob T., chasm, mjirby, linux_china, GuRui, '
                                       + 'cristianobaptista, stgogm, ryanski44, Itamar Haber, elliots, caywood, '
@@ -72,11 +72,22 @@ Tab {
                                       + '</span>'
                                       }
 
-            RichTextWithLinks { html: '<span style="font-size: 9px;">Used third party software and images:<a href="http://qt-project.org/"> Qt5</a>; '
-                                      + '<a href="http://libqxt.org/">Qxt</a> , <a href="http://www.libssh2.org">libssh2</a>, '
-                                      + '<a href="http://code.google.com/p/google-breakpad/">google breakpad</a>, '
+            RichTextWithLinks { html: '<span style="font-size: 11px;">Used third party software and images: <a href="http://qt.io/">Qt</a>; '
+                                      + '<a href="https://github.com/uglide/qredisclient">qredisclient</a>, '
                                       + '<a href="https://github.com/uglide/QtConsole">QtConsole</a>, '
-                                      + '<a href="http://www.carlosprioglio.com/">Redis Logo</a> and other great OSS</span>'}
+                                      + '<a href="http://code.google.com/p/google-breakpad/">google breakpad</a>, '                                      
+                                      + '<a href="http://redis.io/">Redis Logo</a> and other great OSS</span>'}
+
+            Rectangle { color: "#cccccc"; Layout.preferredHeight: 1; Layout.fillWidth: true }
+
+            RichTextWithLinks {
+                Layout.fillWidth: true
+                html: '<img align="left" src="qrc:/images/ga.png" height="50" width="50" /><span style="font-size: 12px; display: block; ">'
+                                      + ' Redis Desktop Manager uses Google Analytics to track which features you are using. '
+                                      + ' <br />&nbsp;This data helps <a href="https://github.com/uglide">me</a> to develop staff that you actually need :)'
+                                      + ' <br />&nbsp;RDM <b>doesn\'t</b> send <a href="https://github.com/uglide/RedisDesktopManager/search?q=GoogleMP&utf8=%E2%9C%93">any sensitive information or data from your databases.</a>'
+                                      + ' <a href="https://github.com/uglide/RedisDesktopManager/wiki/Google-Analytics">More ></a>'
+                                      + ' </span>'}
 
             Rectangle { color: "#cccccc"; Layout.preferredHeight: 1; Layout.fillWidth: true }
 
@@ -87,7 +98,7 @@ Tab {
 
             RichTextWithLinks {
                 id: footerMsg
-                html: '<span style="font-size: 14px; font-weight: 700;"><a style="color: dark-grey;" href="https://www.bountysource.com/teams/redisdesktopmanager">IF YOU FEEL THAT IS USEFUL, <u style="color:green">DONATE</u> TO HELP KEEP DEVELOPMENT GOING.</a></span>'
+                html: '<span style="font-size: 20px; font-weight: 700;"><a style="color: dark-grey;" href="https://www.bountysource.com/teams/redisdesktopmanager">JUST <span style="color:red">DO</span><span style="font-size: 10px; color: grey;">NATE</span> IT!</a></span>'
             }
         }
     }
diff --git a/src/resources/rdm.qrc b/src/resources/rdm.qrc
@@ -28,6 +28,7 @@
         <file alias="ua.png">images/ua.png</file>
         <file alias="filter.png">images/filter.png</file>
         <file alias="gitter.png">images/gitter.png</file>
+        <file alias="ga.png">images/ga.png</file>
     </qresource>
     <qresource prefix="/">
         <file>qml/value-editor.qml</file>

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,14 @@`
`1`	`1`	`#include "quickstartdialog.h"`
`2`	`2`	`#include "ui_quickstartdialog.h"`
	`3`	`+#include <googlemp.h>`
`3`	`4`
`4`	`5`	`QuickStartDialog::QuickStartDialog(QWidget *parent) :`
`5`	`6`	`QDialog(parent),`
`6`	`7`	`ui(new Ui::QuickStartDialog)`
`7`	`8`	`{`
`8`	`9`	`ui->setupUi(this);`
	`10`	`+`
	`11`	`+ GoogleMP::instance()->showScreen("quick-start-dialog");`
`9`	`12`	`}`
`10`	`13`
`11`	`14`	`QuickStartDialog::~QuickStartDialog()`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import QtQuick.Controls 1.2`
`4`	`4`	`import QtQuick.Controls.Styles 1.1`
`5`	`5`	`import QtQuick.Dialogs 1.2`
`6`	`6`	`import QtQuick.Window 2.2`
	`7`	`+import MeasurementProtocol 1.0`
`7`	`8`	`import "./editors/editor.js" as Editor`
`8`	`9`	`import "./parts"`
`9`	`10`
`@@ -52,7 +53,7 @@ Repeater {`
`52`	`53`
`53`	`54`	`Component.onCompleted: {`
`54`	`55`	`keyTab.focus = true`
`55`		`- keyTab.forceActiveFocus()`
	`56`	`+ keyTab.forceActiveFocus()`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`Item {`
`@@ -131,6 +132,8 @@ Repeater {`
`131`	`132`	`onClicked: {`
`132`	`133`	`newKeyName.text = keyNameField.text`
`133`	`134`	`renameConfirmation.open()`
	`135`	`+`
	`136`	`+ Analytics.reportEvent("value-editor", "rename-key")`
`134`	`137`	`}`
`135`	`138`	`}`
`136`	`139`
`@@ -154,6 +157,8 @@ Repeater {`
`154`	`157`
`155`	`158`	`onClicked: {`
`156`	`159`	`deleteConfirmation.open()`
	`160`	`+`
	`161`	`+ Analytics.reportEvent("value-editor", "delete-key")`
`157`	`162`	`}`
`158`	`163`	`}`
`159`	`164`
`@@ -329,7 +334,11 @@ Repeater {`
`329`	`334`	`Layout.preferredWidth: 150`
`330`	`335`	`text: "Add row";`
`331`	`336`	`iconSource: "qrc:/images/add.png"`
`332`		`- onClicked: addRowDialog.open()`
	`337`	`+ onClicked: {`
	`338`	`+ addRowDialog.open()`
	`339`	`+`
	`340`	`+ Analytics.reportEvent("value-editor", "add-row")`
	`341`	`+ }`
`333`	`342`
`334`	`343`	`Dialog {`
`335`	`344`	`id: addRowDialog`
`@@ -390,6 +399,8 @@ Repeater {`
`390`	`399`	`}`
`391`	`400`	`deleteRowConfirmation.rowToDelete = table.currentRow`
`392`	`401`	`deleteRowConfirmation.open()`
	`402`	`+`
	`403`	`+ Analytics.reportEvent("value-editor", "delete-row")`
`393`	`404`	`}`
`394`	`405`
`395`	`406`	`MessageDialog {`
`@@ -422,6 +433,8 @@ Repeater {`
`422`	`433`	`console.log("Reload value in tab")`
`423`	`434`	`table.model.reload()`
`424`	`435`	`valueEditor.clear()`
	`436`	`+`
	`437`	`+ Analytics.reportEvent("value-editor", "reload-key")`
`425`	`438`	`}`
`426`	`439`	`}`
`427`	`440`	`}`
`@@ -528,6 +541,8 @@ Repeater {`
`528`	`541`
`529`	`542`	`savingConfirmation.text = "Value was updated!"`
`530`	`543`	`savingConfirmation.open()`
	`544`	`+`
	`545`	`+ Analytics.reportEvent("value-editor", "update-row")`
`531`	`546`	`}`
`532`	`547`
`533`	`548`	`}`