Skip to content

Commit 64715cf

Browse files
authored
RedisDesktopManager 0.9.0-alpha4 (#3781)
New features and improvements: - Add initial implementation of Native Formatters (#3534) - Add support for Pub/Sub commands in console - Remove build-in zlib compression/decompression - Remove php-unserialize.js formatter - Remove msgpack.js formatter - Update translations - Improve connections dialog - Remove qgamp and clean code - Migrate to Qt 5.8 - Change breakpad origin to github Fixes: - Fix issue #3732: RDM shows invalid error message when trying to connect to invalid host/port - Fix issue #3758: RDM Shows Key Values for One Key Only - Fix tree rendering with multi-char NS - Fix issue #3724: Load NS seperator from connection settings in NS deletion - Fix #3691: RDM doesn't fade deleted keys & namespaces - Fix issue #3791: Model doesn't hide removed row on page > 1
1 parent 1dac2ff commit 64715cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1018
-1397
lines changed

.gitmodules

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,4 @@
99
url = https://github.com/uglide/qredisclient.git
1010
[submodule "3rdparty/gbreakpad"]
1111
path = 3rdparty/gbreakpad
12-
url = https://chromium.googlesource.com/breakpad/breakpad
13-
[submodule "3rdparty/qgamp"]
14-
path = 3rdparty/qgamp
15-
url = https://github.com/uglide/qgamp.git
16-
[submodule "src/qml/3rdparty/php-unserialize-js"]
17-
path = src/qml/3rdparty/php-unserialize-js
18-
url = https://github.com/uglide/php-unserialize-js.git
12+
url = https://github.com/google/breakpad.git

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ install:
1515
fi
1616
- cd ./src && ./configure && cd ./../
1717
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
18-
source /opt/qt57/bin/qt57-env.sh
18+
source /opt/qt58/bin/qt58-env.sh
1919
;
2020
fi
2121
- qmake -v

3rdparty/3rdparty.pri

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnseria
99
# qredisclient
1010
include($$PWD/qredisclient/qredisclient.pri)
1111

12-
#qgamp
13-
include($$PWD/qgamp/qgamp.pri)
14-
DEFINES += GMP_ID=\\\"UA-68484170-1\\\"
15-
1612
# Easylogging
1713
INCLUDEPATH += $$PWD/easyloggingpp/src
1814
HEADERS += $$PWD/easyloggingpp/src/easylogging++.h

3rdparty/gbreakpad

Submodule gbreakpad updated 276 files

3rdparty/qgamp

Lines changed: 0 additions & 1 deletion
This file was deleted.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 0.9.0.{build}
33
clone_depth: 5
44
install:
55
- git submodule update --init --recursive
6-
- set QTDIR=C:\Qt\5.7\msvc2015
6+
- set QTDIR=C:\Qt\5.8\msvc2015
77
- set PATH=%QTDIR%\bin;%PATH%
88
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
99
- nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2

build/common_functions

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@ function build_breakpad {
1111
git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss || true
1212
touch README
1313
./configure
14-
make -j 2
14+
make -s -j 2
1515
}
1616

1717
function build_libssh2 {
18-
cd $DEPS_DIR
19-
git clone https://github.com/libssh2/libssh2.git libssh2 || true
20-
cd libssh2
21-
mkdir bin || rm -fR ./bin && mkdir bin
22-
cd bin
23-
cmake -DCRYPTO_BACKEND=OpenSSL -DENABLE_ZLIB_COMPRESSION=ON ..
24-
cmake --build .
25-
sudo make install
18+
if [ ! -f /usr/local/lib/libssh2.a ]; then
19+
cd $DEPS_DIR
20+
git clone https://github.com/libssh2/libssh2.git libssh2 || true
21+
cd libssh2
22+
mkdir bin || rm -fR ./bin && mkdir bin
23+
cd bin
24+
cmake -DCRYPTO_BACKEND=OpenSSL -DENABLE_ZLIB_COMPRESSION=ON ..
25+
cmake --build .
26+
sudo make install
27+
fi
2628
}
2729

2830
function print_line {

src/app/app.cpp

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <QSettings>
88
#include <QMessageBox>
99
#include <easylogging++.h>
10-
#include <googlemp.h>
1110
#include <qredisclient/redisclient.h>
1211

1312
#include "logger.h"
@@ -21,21 +20,14 @@
2120
#include "modules/value-editor/valueviewmodel.h"
2221
#include "modules/value-editor/viewmodel.h"
2322
#include "modules/value-editor/sortfilterproxymodel.h"
23+
#include "modules/value-editor/formattersmanager.h"
2424
#include "modules/console/consolemodel.h"
2525
#include "modules/server-stats/serverstatsmodel.h"
2626
#include "modules/bulk-operations/bulkoperationsmanager.h"
2727

2828

2929
INITIALIZE_EASYLOGGINGPP
3030

31-
static QObject *analytics_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
32-
{
33-
Q_UNUSED(engine)
34-
Q_UNUSED(scriptEngine)
35-
36-
GoogleMP *gmp = GoogleMP::instance();
37-
return gmp;
38-
}
3931

4032
Application::Application(int &argc, char **argv)
4133
: QApplication(argc, argv),
@@ -45,8 +37,7 @@ Application::Application(int &argc, char **argv)
4537
// Init components required for models and qml
4638
initLog();
4739
initAppInfo();
48-
initAppFonts();
49-
initAppAnalytics();
40+
initAppFonts();
5041
initRedisClient();
5142
initUpdater();
5243
installTranslator();
@@ -65,6 +56,9 @@ void Application::initModels()
6556

6657
connect(m_connections.data(), &ConnectionsManager::openServerStats,
6758
m_serverStatsModel.data(), &TabViewModel::openTab);
59+
60+
m_formattersManager = QSharedPointer<ValueEditor::FormattersManager>(new ValueEditor::FormattersManager());
61+
m_formattersManager->loadFormatters();
6862
}
6963

7064
void Application::initAppInfo()
@@ -103,17 +97,10 @@ void Application::initAppFonts()
10397
QApplication::setFont(defaultFont);
10498
}
10599

106-
void Application::initAppAnalytics()
107-
{
108-
GoogleMP::startSession(QDateTime::currentMSecsSinceEpoch());
109-
GoogleMP::instance()->reportEvent("rdm:cpp", "app start", "");
110-
}
111-
112100
void Application::registerQmlTypes()
113101
{
114102
qmlRegisterType<ValueEditor::ValueViewModel>("rdm.models", 1, 0, "ValueViewModel");
115-
qmlRegisterType<SortFilterProxyModel>("rdm.models", 1, 0, "SortFilterProxyModel");
116-
qmlRegisterSingletonType<GoogleMP>("MeasurementProtocol", 1, 0, "Analytics", analytics_singletontype_provider);
103+
qmlRegisterType<SortFilterProxyModel>("rdm.models", 1, 0, "SortFilterProxyModel");
117104
qRegisterMetaType<ServerConfig>();
118105
}
119106

@@ -124,14 +111,15 @@ void Application::registerQmlRootObjects()
124111
m_engine.rootContext()->setContextProperty("connectionsManager", m_connections.data());
125112
m_engine.rootContext()->setContextProperty("viewModel", m_keyValues.data()); // TODO: Remove legacy name usage in qml
126113
m_engine.rootContext()->setContextProperty("valuesModel", m_keyValues.data());
114+
m_engine.rootContext()->setContextProperty("formattersManager", m_formattersManager.data());
127115
m_engine.rootContext()->setContextProperty("consoleModel", m_consoleModel.data());
128116
m_engine.rootContext()->setContextProperty("serverStatsModel", m_serverStatsModel.data());
129117
m_engine.rootContext()->setContextProperty("appLogger", m_logger);
130118
m_engine.rootContext()->setContextProperty("bulkOperations", m_bulkOperations.data());
131119
}
132120

133121
void Application::initQml()
134-
{
122+
{
135123
registerQmlTypes();
136124
registerQmlRootObjects();
137125
m_engine.load(QUrl(QStringLiteral("qrc:///app.qml")));

src/app/app.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <QQmlApplicationEngine>
55
#include <QFontDatabase>
66
#include <QMenu>
7-
#include <googlemp.h>
87

98
#ifndef RDM_VERSION
109
#include "../version.h"
@@ -16,6 +15,7 @@ class Updater;
1615
class LogHandler;
1716
class TabViewModel;
1817
namespace ValueEditor { class ViewModel; }
18+
namespace ValueEditor { class FormattersManager; }
1919
namespace BulkOperations { class Manager; }
2020

2121

@@ -30,8 +30,7 @@ class Application : public QApplication
3030

3131
private:
3232
void initAppInfo();
33-
void initAppFonts();
34-
void initAppAnalytics();
33+
void initAppFonts();
3534
void registerQmlTypes();
3635
void registerQmlRootObjects();
3736
void initLog();
@@ -48,6 +47,7 @@ private slots:
4847
QSharedPointer<ConnectionsManager> m_connections;
4948
QSharedPointer<Updater> m_updater;
5049
QSharedPointer<ValueEditor::ViewModel> m_keyValues;
50+
QSharedPointer<ValueEditor::FormattersManager> m_formattersManager;
5151
QSharedPointer<BulkOperations::Manager> m_bulkOperations;
5252
QSharedPointer<TabViewModel> m_consoleModel;
5353
QSharedPointer<TabViewModel> m_serverStatsModel;

0 commit comments

Comments
 (0)