From d3a13745779ce168b12e181ce4950f8c2e3f8619 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 27 Oct 2016 19:54:05 +0300 Subject: [PATCH 1/9] Update connections tree: - Fix issues with rendering - Add Redis Cluster support --- 3rdparty/qredisclient | 2 +- src/app/models/treeoperations.cpp | 42 ++-- src/app/models/treeoperations.h | 2 + .../items/abstractnamespaceitem.cpp | 2 +- .../connections-tree/items/databaseitem.h | 4 +- src/modules/connections-tree/items/keyitem.h | 2 + .../connections-tree/items/namespaceitem.cpp | 15 +- .../connections-tree/items/namespaceitem.h | 3 + .../connections-tree/items/serveritem.cpp | 19 +- .../connections-tree/items/serveritem.h | 2 + src/modules/connections-tree/items/treeitem.h | 4 +- src/modules/connections-tree/model.cpp | 31 ++- src/modules/connections-tree/model.h | 7 +- src/modules/connections-tree/operations.h | 2 + src/qml/connections-tree/BetterTreeView.qml | 183 +++++++++--------- src/resources/images.qrc | 5 +- src/resources/images/cluster.svg | 147 ++++++++++++++ src/resources/images/db.svg | 91 ++++++++- src/resources/images/editdb.svg | 93 ++++++++- src/resources/images/export.svg | 85 +++++++- src/resources/images/import.svg | 127 +++++++++++- src/resources/images/loader.gif | Bin 1737 -> 0 bytes src/resources/images/server.svg | 106 ++++++++-- src/resources/images/server_offline.svg | 89 +++++++++ src/resources/images/settings.svg | 56 +++++- 25 files changed, 941 insertions(+), 178 deletions(-) create mode 100644 src/resources/images/cluster.svg delete mode 100644 src/resources/images/loader.gif create mode 100644 src/resources/images/server_offline.svg diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient index d2349db21..d17c55bda 160000 --- a/3rdparty/qredisclient +++ b/3rdparty/qredisclient @@ -1 +1 @@ -Subproject commit d2349db21b62efd1bcf8e3e1f170c00624aef322 +Subproject commit d17c55bdac834a09daab23907fc197dc87347a6e diff --git a/src/app/models/treeoperations.cpp b/src/app/models/treeoperations.cpp index 53be7adf1..bf1aede7e 100644 --- a/src/app/models/treeoperations.cpp +++ b/src/app/models/treeoperations.cpp @@ -34,22 +34,25 @@ void TreeOperations::getDatabases(std::functiongetKeyspaceInfo(); - //detect all databases - RedisClient::Response scanningResp; - int dbIndex = (availableDatabeses.size() == 0)? 0 : availableDatabeses.lastKey() + 1; - - while (true) { - try { - scanningResp = m_connection->commandSync("select", QString::number(dbIndex)); - } catch (const RedisClient::Connection::Exception& e) { - throw ConnectionsTree::Operations::Exception(QObject::tr("Connection error: ") + QString(e.what())); + if (m_connection->mode() != RedisClient::Connection::Mode::Cluster) { + //detect all databases + RedisClient::Response scanningResp; + int dbIndex = (availableDatabeses.size() == 0)? 0 : availableDatabeses.lastKey() + 1; + + while (true) { + try { + scanningResp = m_connection->commandSync("select", QString::number(dbIndex)); + } catch (const RedisClient::Connection::Exception& e) { + throw ConnectionsTree::Operations::Exception(QObject::tr("Connection error: ") + QString(e.what())); + } + + if (!scanningResp.isOkMessage()) + break; + + availableDatabeses.insert(dbIndex, 0); + ++dbIndex; } - if (!scanningResp.isOkMessage()) - break; - - availableDatabeses.insert(dbIndex, 0); - ++dbIndex; } emit m_manager.openServerStats(m_connection); @@ -63,7 +66,11 @@ void TreeOperations::getDatabaseKeys(uint dbIndex, QString filter, QString keyPattern = filter.isEmpty() ? static_cast(m_connection->getConfig()).keysPattern() : filter; try { - m_connection->getDatabaseKeys(callback, keyPattern, dbIndex); + if (m_connection->mode() == RedisClient::Connection::Mode::Cluster) { + m_connection->getClusterKeys(callback, keyPattern); + } else { + m_connection->getDatabaseKeys(callback, keyPattern, dbIndex); + } } catch (const RedisClient::Connection::Exception& error) { callback(RedisClient::Connection::RawKeysList(), QString(QObject::tr("Cannot load keys: %1")).arg(error.what())); } @@ -153,3 +160,8 @@ void TreeOperations::flushDb(int dbIndex, std::function ca throw ConnectionsTree::Operations::Exception(QObject::tr("FlushDB error: ") + QString(e.what())); } } + +QString TreeOperations::mode() +{ + return m_connection->mode() == RedisClient::Connection::Mode::Cluster? QString("cluster") : QString("standalone"); +} diff --git a/src/app/models/treeoperations.h b/src/app/models/treeoperations.h index 72b085b5b..c16e93914 100644 --- a/src/app/models/treeoperations.h +++ b/src/app/models/treeoperations.h @@ -40,6 +40,8 @@ class TreeOperations : public QObject, public ConnectionsTree::Operations virtual void flushDb(int dbIndex, std::function callback) override; + virtual QString mode() override; + private: QSharedPointer m_connection; ConnectionsManager& m_manager; diff --git a/src/modules/connections-tree/items/abstractnamespaceitem.cpp b/src/modules/connections-tree/items/abstractnamespaceitem.cpp index b62be9281..d0f4e1a8b 100644 --- a/src/modules/connections-tree/items/abstractnamespaceitem.cpp +++ b/src/modules/connections-tree/items/abstractnamespaceitem.cpp @@ -170,7 +170,7 @@ void AbstractNamespaceItem::renderChilds() QSharedPointer self = getSelf().toStrongRef(); if (!self) { - qDebug() << "Cannot render keys: invalid parent item"; + qDebug() << "Cannot render keys: invalid parent item"; return; } diff --git a/src/modules/connections-tree/items/databaseitem.h b/src/modules/connections-tree/items/databaseitem.h index 510063a51..4e8d6c84c 100644 --- a/src/modules/connections-tree/items/databaseitem.h +++ b/src/modules/connections-tree/items/databaseitem.h @@ -24,7 +24,9 @@ class DatabaseItem : public QObject, public AbstractNamespaceItem QString getIconUrl() const override; - QString getType() const override { return "database"; } + QString getType() const override { return "database"; } + + int itemDepth() const override { return 1; } bool isLocked() const override; diff --git a/src/modules/connections-tree/items/keyitem.h b/src/modules/connections-tree/items/keyitem.h index e4b46d7c8..f172c57fe 100644 --- a/src/modules/connections-tree/items/keyitem.h +++ b/src/modules/connections-tree/items/keyitem.h @@ -22,6 +22,8 @@ class KeyItem : public TreeItem QString getType() const override { return "key"; } + int itemDepth() const override { return m_fullPath.count(m_operations->getNamespaceSeparator().toUtf8()) + 2; } + QList> getAllChilds() const override; bool supportChildItems() const override; diff --git a/src/modules/connections-tree/items/namespaceitem.cpp b/src/modules/connections-tree/items/namespaceitem.cpp index fc2eb9cc5..f3cb4df55 100644 --- a/src/modules/connections-tree/items/namespaceitem.cpp +++ b/src/modules/connections-tree/items/namespaceitem.cpp @@ -14,15 +14,21 @@ NamespaceItem::NamespaceItem(const QByteArray &fullPath, const KeysTreeRenderer::RenderingSettigns& settings) : AbstractNamespaceItem(model, parent, operations, settings), m_fullPath(fullPath), - m_removed(false) + m_removed(false), + m_rendering(false) { m_displayName = m_fullPath.mid(m_fullPath.lastIndexOf(settings.nsSeparator) + 1); m_eventHandlers.insert("click", [this]() { - if (m_childItems.size() != 0) - return; + if (m_childItems.size() == 0) { + m_rendering = true; + m_model.itemChanged(getSelf()); - renderChilds(); + renderChilds(); + + m_rendering = false; + m_model.itemChanged(getSelf()); + } }); m_eventHandlers.insert("delete", [this]() { @@ -42,6 +48,7 @@ QByteArray NamespaceItem::getName() const QString NamespaceItem::getIconUrl() const { + if (m_rendering) return QString("qrc:/images/wait.svg"); return QString("qrc:/images/namespace.svg"); } diff --git a/src/modules/connections-tree/items/namespaceitem.h b/src/modules/connections-tree/items/namespaceitem.h index 1e3c61387..dad561e1e 100644 --- a/src/modules/connections-tree/items/namespaceitem.h +++ b/src/modules/connections-tree/items/namespaceitem.h @@ -24,6 +24,8 @@ class NamespaceItem : public QObject, public AbstractNamespaceItem QString getType() const override { return "namespace"; } + int itemDepth() const override { return m_fullPath.count(m_renderingSettings.nsSeparator.toUtf8()) + 2; } + bool isLocked() const override; bool isEnabled() const override; @@ -36,5 +38,6 @@ class NamespaceItem : public QObject, public AbstractNamespaceItem QByteArray m_fullPath; QByteArray m_displayName; bool m_removed; + bool m_rendering; }; } diff --git a/src/modules/connections-tree/items/serveritem.cpp b/src/modules/connections-tree/items/serveritem.cpp index 470c43d0a..7b3a9183f 100644 --- a/src/modules/connections-tree/items/serveritem.cpp +++ b/src/modules/connections-tree/items/serveritem.cpp @@ -26,7 +26,7 @@ ServerItem::ServerItem(const QString& name, QSharedPointer operation if (isDatabaseListLoaded()) return; - load(); + load(); }); m_eventHandlers.insert("console", [this]() { @@ -35,17 +35,18 @@ ServerItem::ServerItem(const QString& name, QSharedPointer operation m_eventHandlers.insert("reload", [this]() { reload(); + emit m_model.itemChanged(getSelf()); }); m_eventHandlers.insert("unload", [this]() { - unload(); + unload(); }); m_eventHandlers.insert("edit", [this]() { confirmAction(nullptr, tr("Value and Console tabs related to this " "connection will be closed. Do you want to continue?"), [this]() { - unload(); + unload(); emit editActionRequested(); }); }); @@ -53,7 +54,7 @@ ServerItem::ServerItem(const QString& name, QSharedPointer operation m_eventHandlers.insert("delete", [this]() { confirmAction(nullptr, tr("Do you really want delete connection?"), [this]() { - unload(); + unload(); emit deleteActionRequested(); }); }); @@ -71,8 +72,14 @@ QString ServerItem::getDisplayName() const QString ServerItem::getIconUrl() const { if (m_locked) return QString("qrc:/images/wait.svg"); - if (isDatabaseListLoaded()) return QString("qrc:/images/server.svg"); - return QString("qrc:/images/server.svg"); //offline + if (isDatabaseListLoaded()) { + if (m_operations->mode() == "cluster") { + return QString("qrc:/images/cluster.svg"); + } else { + return QString("qrc:/images/server.svg"); + } + } + return QString("qrc:/images/server_offline.svg"); } QList > ServerItem::getAllChilds() const diff --git a/src/modules/connections-tree/items/serveritem.h b/src/modules/connections-tree/items/serveritem.h index 699579fb6..c3d2e45b2 100644 --- a/src/modules/connections-tree/items/serveritem.h +++ b/src/modules/connections-tree/items/serveritem.h @@ -24,6 +24,8 @@ class ServerItem : public QObject, public TreeItem QString getType() const override { return "server"; } + int itemDepth() const override { return 0; } + QList> getAllChilds() const override; uint childCount(bool recursive = false) const override; diff --git a/src/modules/connections-tree/items/treeitem.h b/src/modules/connections-tree/items/treeitem.h index 426e40f47..e2e975a53 100644 --- a/src/modules/connections-tree/items/treeitem.h +++ b/src/modules/connections-tree/items/treeitem.h @@ -30,7 +30,9 @@ class TreeItem { virtual QString getIconUrl() const = 0; - virtual QString getType() const = 0; + virtual QString getType() const = 0; + + virtual int itemDepth() const = 0; virtual QList> getAllChilds() const = 0; diff --git a/src/modules/connections-tree/model.cpp b/src/modules/connections-tree/model.cpp index d401aa02a..e18b990de 100644 --- a/src/modules/connections-tree/model.cpp +++ b/src/modules/connections-tree/model.cpp @@ -33,6 +33,7 @@ QVariant Model::data(const QModelIndex &index, int role) const case itemType: return item->getType(); case itemOriginalName: return item->getName(); case itemIsInitiallyExpanded: return item->isExpanded(); + case itemDepth: return item->itemDepth(); } return QVariant(); @@ -44,6 +45,7 @@ QHash Model::roleNames() const roles[itemName] = "name"; roles[itemType] = "type"; roles[itemIsInitiallyExpanded] = "expanded"; + roles[Qt::DecorationRole] = "icon"; return roles; } @@ -108,12 +110,25 @@ int Model::rowCount(const QModelIndex &parent) const if (!parentItem) return m_treeItems.size(); - if (parent.column() > 0) - return 0; - return parentItem->childCount(); } +bool Model::hasChildren(const QModelIndex &parent) +{ + const TreeItem* parentItem = getItemFromIndex(parent); + + if (!parentItem) + return m_treeItems.size() > 0; + + if (parentItem->getType() == "key") + return false; + + if (parentItem->getType() == "namespace" || parentItem->getType() == "server") + return true; + + return parentItem->childCount() > 0; +} + QModelIndex Model::getIndexFromItem(QWeakPointer item) { if (item && item.toStrongRef()) { @@ -146,7 +161,7 @@ void Model::onItemChanged(QWeakPointer item) auto index = getIndexFromItem(item); - if (!index.isValid() || item.toStrongRef()->childCount() == 0) + if (!index.isValid()) return; emit dataChanged(index, index); @@ -167,6 +182,8 @@ void Model::onItemChildsLoaded(QWeakPointer item) emit beginInsertRows(index, 0, treeItem->childCount() - 1); emit endInsertRows(); + emit dataChanged(index, index); + if (treeItem->getType() == "database") { emit expand(index); @@ -176,7 +193,7 @@ void Model::onItemChildsLoaded(QWeakPointer item) } else { qDebug() << "Namespace reopening is disabled in settings"; m_expanded.clear(); - } + } } else if (treeItem->getType() == "server" || treeItem->getType() == "namespace") { emit expand(index); } @@ -210,9 +227,9 @@ void Model::onExpandItem(QWeakPointer item) } -QVariant Model::getItemIcon(const QModelIndex &index) +QVariant Model::getItemDepth(const QModelIndex &index) { - return data(index, Qt::DecorationRole); + return data(index, itemDepth); } QVariant Model::getItemType(const QModelIndex &index) diff --git a/src/modules/connections-tree/model.h b/src/modules/connections-tree/model.h index 9fc126b89..45950f8d5 100644 --- a/src/modules/connections-tree/model.h +++ b/src/modules/connections-tree/model.h @@ -21,7 +21,8 @@ namespace ConnectionsTree { itemOriginalName, itemType, itemFullPath, - itemIsInitiallyExpanded + itemIsInitiallyExpanded, + itemDepth }; public: @@ -39,6 +40,8 @@ namespace ConnectionsTree { int rowCount(const QModelIndex & parent = QModelIndex()) const; + bool hasChildren(const QModelIndex &parent = QModelIndex()); + inline int columnCount(const QModelIndex & parent = QModelIndex()) const { Q_UNUSED(parent); @@ -94,7 +97,7 @@ namespace ConnectionsTree { void onExpandItem(QWeakPointer item); public slots: - QVariant getItemIcon(const QModelIndex &index); + QVariant getItemDepth(const QModelIndex &index); QVariant getItemType(const QModelIndex &index); diff --git a/src/modules/connections-tree/operations.h b/src/modules/connections-tree/operations.h index d8b23b876..7010641df 100644 --- a/src/modules/connections-tree/operations.h +++ b/src/modules/connections-tree/operations.h @@ -60,6 +60,8 @@ namespace ConnectionsTree { virtual void flushDb(int dbIndex, std::function callback) = 0; + virtual QString mode() = 0; + virtual ~Operations() {} }; diff --git a/src/qml/connections-tree/BetterTreeView.qml b/src/qml/connections-tree/BetterTreeView.qml index bca63736f..36a097796 100644 --- a/src/qml/connections-tree/BetterTreeView.qml +++ b/src/qml/connections-tree/BetterTreeView.qml @@ -13,122 +13,115 @@ TreeView { TableViewColumn { title: "item" - role: "name" - width: root.width - } - - selectionMode: SelectionMode.SingleSelection - - selection: ItemSelectionModel { - id: connectionTreeSelectionModel - model: connectionsManager + role: "icon" + width: 25 + delegate: Item { + Image { + anchors.centerIn: parent + sourceSize.width: 25 + sourceSize.height: 25 + source: styleData.value + cache: true + asynchronous: true + } + } } - model: connectionsManager - - rowDelegate: Rectangle { - height: 28 - color: styleData.selected ? "#e2e2e2" : "white" //sysPalette.highlight + TableViewColumn { + id: itemColumn + title: "item" + role: "name" + width: root.width - 20 } itemDelegate: Item { - id: itemRoot - - Loader { - id: itemIcon - width: 21 - height: 21 - asynchronous: true - - anchors {left: itemRoot.left; verticalCenter: itemRoot.verticalCenter; } - - sourceComponent: Component { - Image { - anchors.centerIn: parent - - sourceSize.width: 25 - sourceSize.height: 25 - - source: { - if (!connectionsManager || !styleData.index) - return "" - - var icon = connectionsManager.getItemIcon(styleData.index) - - if (icon != undefined) { - return icon - } else { - return "" - } - } - } - } - } + id: itemRoot Item { - id: itemText - anchors {left: itemIcon.right; top: itemRoot.top; bottom: itemRoot.bottom; leftMargin: 5 } + id: wrapper + height: 30 + anchors.left: parent.left + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.rightMargin: 10 + Text { + anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - //color: styleData.selected ? sysPalette.highlightedText : styleData.textColor - elide: styleData.elideMode + //elide: styleData.elideMode text: styleData.value + anchors.leftMargin: { + var itemDepth = connectionsManager.getItemDepth(styleData.index) + return itemDepth * 10 + 15 + } } - } - Loader { - id: menuLoader - anchors {right: itemRoot.right; top: itemRoot.top; bottom: itemRoot.bottom; } - anchors.rightMargin: 20 - height: parent.height - visible: styleData.selected - asynchronous: true - - source: { - if (!styleData.selected - || !connectionsManager - || !styleData.index) - return "" - - var type = connectionsManager.getItemType(styleData.index) - - if (type != undefined) { - return "./menu/" + type + ".qml" - } else { - return "" + Loader { + id: menuLoader + anchors {right: wrapper.right; top: wrapper.top; bottom: wrapper.bottom; } + anchors.rightMargin: 20 + height: parent.height + visible: styleData.selected + asynchronous: true + + source: { + if (!styleData.selected + || !connectionsManager + || !styleData.index) + return "" + + var type = connectionsManager.getItemType(styleData.index) + + if (type != undefined) { + return "./menu/" + type + ".qml" + } else { + return "" + } } } - } - MouseArea { - anchors.left: itemIcon.left - anchors.top: parent.top - anchors.right: parent.right - anchors.bottom: parent.bottom + MouseArea { + anchors.fill: parent - acceptedButtons: Qt.RightButton | Qt.MiddleButton + acceptedButtons: Qt.RightButton | Qt.MiddleButton - onClicked: { - console.log("Catch event to item") + onClicked: { + console.log("Catch event to item") - if(mouse.button == Qt.RightButton) { - mouse.accepted = true - connectionTreeSelectionModel.setCurrentIndex(styleData.index, 1) - connectionsManager.sendEvent(styleData.index, "right-click") - return - } + if(mouse.button == Qt.RightButton) { + mouse.accepted = true + connectionTreeSelectionModel.setCurrentIndex(styleData.index, 1) + connectionsManager.sendEvent(styleData.index, "right-click") + return + } - if (mouse.button == Qt.MiddleButton) { - mouse.accepted = true - connectionsManager.sendEvent(styleData.index, "mid-click") - return + if (mouse.button == Qt.MiddleButton) { + mouse.accepted = true + connectionsManager.sendEvent(styleData.index, "mid-click") + return + } } } + + focus: true + Keys.forwardTo: menuLoader.item ? [menuLoader.item] : [] + } + } + + selectionMode: SelectionMode.SingleSelection - focus: true - Keys.forwardTo: menuLoader.item ? [menuLoader.item] : [] + selection: ItemSelectionModel { + id: connectionTreeSelectionModel + model: connectionsManager + } + + model: connectionsManager + + rowDelegate: Rectangle { + height: 30 + color: styleData.selected ? "#e2e2e2" : "white" //sysPalette.highlight } onClicked: { @@ -144,8 +137,12 @@ TreeView { Connections { target: connectionsManager; onExpand: { - if (!root.isExpanded(index)) { + if (!root.isExpanded(index)) { root.expand(index) + + // Hack to prevent rendering issues + root.__listView.contentY = root.__listView.contentY + 20 + root.__listView.forceLayout() } } } diff --git a/src/resources/images.qrc b/src/resources/images.qrc index ce26d3b9c..09727c198 100644 --- a/src/resources/images.qrc +++ b/src/resources/images.qrc @@ -17,13 +17,13 @@ images/export.svg images/editdb.svg images/delete.svg - redis.ico - images/loader.gif + redis.ico images/ua.svg images/filter.svg images/chat.svg images/ga.png images/server.svg + images/server_offline.svg images/offline.svg images/settings.svg images/console.svg @@ -32,5 +32,6 @@ images/live_update.svg images/live_update_disable.svg images/copy.svg + images/cluster.svg diff --git a/src/resources/images/cluster.svg b/src/resources/images/cluster.svg new file mode 100644 index 000000000..0e51f7729 --- /dev/null +++ b/src/resources/images/cluster.svg @@ -0,0 +1,147 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/db.svg b/src/resources/images/db.svg index 8e15913f2..532001702 100644 --- a/src/resources/images/db.svg +++ b/src/resources/images/db.svg @@ -1 +1,90 @@ - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/resources/images/editdb.svg b/src/resources/images/editdb.svg index f7e6a699f..f2985d145 100644 --- a/src/resources/images/editdb.svg +++ b/src/resources/images/editdb.svg @@ -1,9 +1,84 @@ - - - - - - - - - \ No newline at end of file + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/export.svg b/src/resources/images/export.svg index 65f77a259..30c0c41e2 100644 --- a/src/resources/images/export.svg +++ b/src/resources/images/export.svg @@ -1,7 +1,78 @@ - - - - - - - \ No newline at end of file + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/import.svg b/src/resources/images/import.svg index 74ade4669..877f55b04 100644 --- a/src/resources/images/import.svg +++ b/src/resources/images/import.svg @@ -1,7 +1,120 @@ - - - - - - - \ No newline at end of file + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/loader.gif b/src/resources/images/loader.gif deleted file mode 100644 index 1560b646cff2cc4fd292d7fdb6f7adc7eb484b4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1737 zcmaLXeN0p99l-I&!tEQiv~W&~lv_&SmI|fRw)eE0zR=T_(^9a!crF*Q_O?JP*50BW za+x#6J*VfyIVLB@`G?mSW{fe8%LJS?j`_k2*Er)fUT2(h#u;OrF~)0*amLK)uKSPd z_ve%6mwfVklPAzh+MD7sAOkM}c>DG(0N}=r8~gU{i^XCdkH_!#XEK??hY#PmbLYsB zBQ-TOdcEFcGGQ3zcDqxl)R{A9Dk>_n+3b@iPo6$~y0EaYd-v|n&dz8wdiLzuYuB#f zIId7A#>dBxA3q+6M7D3=e*gY`mSv?<>Cn*7!Gi~r$>gb1r$~|%i^V5SoY=pAe_2@> zpU;2v=+TQ8FUH2ka=F~gmoFiN$BrF){rdHrH*e0LKY#i1-Mo2odV2cVvuD?@ zUw`o6!QH!euU@^nxVSh!KY#Duy<4|#J%9fE_U+r-wrx9k^5pF7Y2!hz{_K}ehqtPf73O8@wtkGyFib|)`J9qAU_vSxN)!U+Q3$?~abhem{rh;Yf zPOJW1?#m|PBZ)!HR~tu$H1Sk?EIk|_G;Yi!he6f93Ps{~w+!$1-$w+3U+n~t&M}Ot zdSwI42rFvpj1a?ZjJW9IPwE??&E&#p9=}A*VhFMy6cm+?16Q*P7E0tZ7Ed$$XgM+i z94(M9MQ3b;8w!dQGl;PjLVE4Y?<_P{QXeB^>`CbQFBvD_OT*#R6y9XGLopA~j#=m{7->pd6t>(Yi=3 zP}uo3V`jwsY7W}yU|ZK5z%f|Z?m9z~uy*yuIRu5uFfoVs{~5H(gmaYV0%%rtm$QvL z{~uwK+1e_?@y3>z>U)~d^%(jpL%ul0QBAF>DcN4YPSb$5Y$@O`J^)4H(vAG6fyV-$ zpp9QFT`ozb8GCfYP#22&x;IILw01D;WQQ6$Rd7I-5KT1ikgn+a(|F~;N5`@Dq1(|Cs^MXKy8P08>2 ze(zaIH}OH&tXIpzRp|f=nv{at6&u#2!XbvJ4yIM4%e%g~!%0&*vz<+T(e8jvJ$eoV zB?T~K5as2YK8NWfo<~YPgTv`>IqKsqR5<(dp)cEDK=00n>#89cvunA{%L%$M)}%E- z+Y7LTL0WhsE#TMm`-=Xj>PZ!`)~ z(K&8wwg6)N&3|FkYgh7U3x!zd`r4lqi5ZME;n0{F5#}>?i)rEJH#GeJiA|m+eZ8DO zSU?f>fl#Gzi`dPes#t)+aBX={4?$xdcO&byCid?1(awZqf1}Z}+v{|OO zt|T#wanNsY&NCKu;zG`1RYSh)xbINpDJ|DFE; D?d&fs diff --git a/src/resources/images/server.svg b/src/resources/images/server.svg index 8bb7ff6f1..1c6313ff4 100644 --- a/src/resources/images/server.svg +++ b/src/resources/images/server.svg @@ -1,17 +1,89 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/server_offline.svg b/src/resources/images/server_offline.svg new file mode 100644 index 000000000..8d7ccdff0 --- /dev/null +++ b/src/resources/images/server_offline.svg @@ -0,0 +1,89 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/resources/images/settings.svg b/src/resources/images/settings.svg index 20e6c93be..be05c5273 100644 --- a/src/resources/images/settings.svg +++ b/src/resources/images/settings.svg @@ -1,4 +1,52 @@ - - - - \ No newline at end of file + + + +image/svg+xml \ No newline at end of file From 88734aa6afcbbd71f6711c776f7b2d33154b48c1 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 27 Oct 2016 19:55:31 +0300 Subject: [PATCH 2/9] Update Console: - Add Redis Cluster support - Fix issues --- 3rdparty/qredisclient | 2 +- src/modules/console/consolemodel.cpp | 34 ++++++++++++++++++++++------ src/modules/console/consolemodel.h | 3 +++ src/qml/console/Consoles.qml | 8 +++++-- src/qml/console/QConsole.qml | 4 ++-- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient index d17c55bda..32a2697c7 160000 --- a/3rdparty/qredisclient +++ b/3rdparty/qredisclient @@ -1 +1 @@ -Subproject commit d17c55bdac834a09daab23907fc197dc87347a6e +Subproject commit 32a2697c73e2bf224d3c6cde7152ac9a8d33af3d diff --git a/src/modules/console/consolemodel.cpp b/src/modules/console/consolemodel.cpp index 23e4dc715..a6d361fcb 100644 --- a/src/modules/console/consolemodel.cpp +++ b/src/modules/console/consolemodel.cpp @@ -21,8 +21,13 @@ void Model::init() return; } - emit addOutput(QObject::tr("Connected.\n"), "complete"); - emit changePrompt(QString("%1:0>").arg(m_connection->getConfig().name()), true); + if (m_connection->mode() == RedisClient::Connection::Mode::Cluster) { + emit addOutput(QObject::tr("Connected to cluster.\n"), "complete"); + } else { + emit addOutput(QObject::tr("Connected.\n"), "complete"); + } + + updatePrompt(true); } QString Model::getName() const @@ -49,16 +54,31 @@ void Model::executeCommand(const QString & cmd) return; } - if (command.isSelectCommand()) + if (command.isSelectCommand() || m_connection->mode() == RedisClient::Connection::Mode::Cluster) { m_current_db = command.getPartAsString(1).toInt(); + updatePrompt(false); + } + QVariant value = result.getValue(); + emit addOutput(RedisClient::Response::valueToHumanReadString(value), "complete"); +} + +void Model::updatePrompt(bool showPrompt) +{ + if (m_connection->mode() == RedisClient::Connection::Mode::Cluster) { + emit changePrompt( + QString("%1(%2:%3)>") + .arg(m_connection->getConfig().name()) + .arg(m_connection->getConfig().host()) + .arg(m_connection->getConfig().port()), + showPrompt + ); + } else { emit changePrompt( QString("%1:%2>") .arg(m_connection->getConfig().name()) - .arg(command.getPartAsString(1)), - false + .arg(m_current_db), + showPrompt ); } - QVariant value = result.getValue(); - emit addOutput(RedisClient::Response::valueToHumanReadString(value), "complete"); } diff --git a/src/modules/console/consolemodel.h b/src/modules/console/consolemodel.h index 06754c514..5fd119f28 100644 --- a/src/modules/console/consolemodel.h +++ b/src/modules/console/consolemodel.h @@ -24,5 +24,8 @@ namespace Console { private: int m_current_db; + + private: + void updatePrompt(bool showPrompt); }; } diff --git a/src/qml/console/Consoles.qml b/src/qml/console/Consoles.qml index 2ec841023..72dfe4020 100644 --- a/src/qml/console/Consoles.qml +++ b/src/qml/console/Consoles.qml @@ -23,6 +23,8 @@ Repeater { QConsole { id: redisConsole + property var model: consoleModel.getValue(tabIndex) + Connections { target: consoleModel ? consoleModel.getValue(tabIndex) : null @@ -36,14 +38,16 @@ Repeater { } onExecCommand: { - consoleModel.getValue(tabIndex).executeCommand(command) + if (model) + model.executeCommand(command) } Timer { id: initTimer onTriggered: { - consoleModel.getValue(tabIndex).init() + if (model) + model.init() } } diff --git a/src/qml/console/QConsole.qml b/src/qml/console/QConsole.qml index 8ec896a1e..7bfa88945 100644 --- a/src/qml/console/QConsole.qml +++ b/src/qml/console/QConsole.qml @@ -13,7 +13,7 @@ Rectangle { property alias busy: textArea.readOnly property string initText: - "RDM Redis Console | Unsupported commands: DUMP, RESTORE, AUTH
" + + "RDM Redis Console
" + "Connecting ..." @@ -40,7 +40,7 @@ Rectangle { if (type == "error") { textArea.append("" + text + '') } else { - textArea.append("" + text + '') + textArea.append("
" + text + '
') } if (type == "complete" || type == "error") { From a575b82616c0bb07c82b8a002b9dba1905490d54 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 13:26:49 +0200 Subject: [PATCH 3/9] Update translations --- src/resources/translations/rdm.qm | 1 + src/resources/translations/rdm.ts | 75 ++--- src/resources/translations/rdm_zh_CN.qm | Bin 13916 -> 13165 bytes src/resources/translations/rdm_zh_CN.ts | 89 ++++-- src/resources/translations/rdm_zh_TW.qm | Bin 16 -> 13185 bytes src/resources/translations/rdm_zh_TW.ts | 388 +++++++++++++----------- 6 files changed, 310 insertions(+), 243 deletions(-) create mode 100644 src/resources/translations/rdm.qm diff --git a/src/resources/translations/rdm.qm b/src/resources/translations/rdm.qm new file mode 100644 index 000000000..be651eede --- /dev/null +++ b/src/resources/translations/rdm.qm @@ -0,0 +1 @@ + - Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. + Live update was disabled due to exceeded keys limit. Please specify filter more carrfully or change limit in settings. ConnectionsTree::ServerItem - - All value and console tabs related to thisconnection will be closed. Do you want to continue? + + Value and Console tabs related to this connection will be closed. Do you want to continue? - + Do you really want delete connection? @@ -496,17 +496,17 @@ - + Settings directory is not writable - + RDM can't save connections file to settings directory. Please change file permissions or restart RDM as administrator. - + Please download new version of Redis Desktop Manager: %1 @@ -537,18 +537,13 @@ - + Connection error: - Value with same key already exist - - - - - Partial data loaded from server + Value with the same key already exist @@ -577,28 +572,28 @@ - + Cannot load keys: %1 - - + + Cannot remove key: %1 - + Delete key error: - + FlushDB error: - + Cannot load databases: @@ -606,29 +601,40 @@ - + Connection error. Check network connection - + Invalid Connection. Check connection settings. - + + Connected to cluster. + + + + + Connected. - + Connection error: - + + Cannot update server info tab. Error: %0 + + + + Server %0 @@ -678,6 +684,7 @@ + Data was loaded from server partially. @@ -749,22 +756,22 @@ - + Mb - + Server Info - + Property - + Value @@ -822,6 +829,11 @@ The row is the last one in the key. After removing it key will be deleted. + + + Do you really want to remove this row? + + Search on page... @@ -859,11 +871,6 @@ Delete row - - - Do you relly want to remove this row? - - app diff --git a/src/resources/translations/rdm_zh_CN.qm b/src/resources/translations/rdm_zh_CN.qm index 5b0161f035fd64bea220e0bb3850f380760f88e9..2ba08e0a85080fb9871697fa484292ad9206553e 100644 GIT binary patch delta 1082 zcmX9-drVbz9RJ+&;M{Z1IrqQ-xdPq?ugeuK7)_W_pp-V43}pggb|YSf86(U;k`$EJ z*22`&O&kwLBEvgy=B+^}Qx?Qyxwwoj1k_pZkuv}az!z=@ zq~E~rp9j_lfp4Fn^9DaAOc6c<5+}hAoC2)ZV2Lo(_hW1_-h2y)%g46VyTFEvr`wY1 z9k+43l4!+goICLaV7si_)$a!Mt-5`?za;t!UG4NmIuBV;_FHlS?j zUm!L$pywI&Y8QpLpL`VLiBROSQiHz;Wp|T+s8@uyM^}kQ6KXo22TTuyLp8Z17}g?u z@b_U#ye#w;+v$f@VW_AKU>*tc(ijnR>bddLR9S^S)k;LsR(<75e*uD9@A-9+5@qX$ z3QEXOpVr01vpK3J*`O)4hy)#VX z3EV0joS}McjZz!?lv>oJ0k?zB1?lT3y3V9XKhJr{P zt6R=%)X3CXxuSGCWloiko}*F|&9b{|gu<-J7v^6jJR)DX{|Dht`I_z!g&X&y>8iXu z7)l|0iWGZ=w!)^wyC@{)Ey^i zFRaPxfia>A30B{2JwQ(=SUuL9L7H=F^O=`v&OY_#WDG6Lg8DQ&pYFY01tisJ9l{20 f8vk6Vwm+i5I}*7lc~|0lIj_&@;k*x0>e&AQ6Q(B^ delta 1699 zcmX|AdrVVj6hF7Uec!e^1)-pPJVlgR-3C!q6sJa`2u&3gFkaf*QoOWHUq}?{1AGke zL9J8gbUrZZoN+^^!>KrM3eh1tVz&5LrcBKO&es%Q?9?XyadUFN@0{QH{eI_s-R7IT zZ`>(UMBAgCfh)1m=N9cbb1Mr#1o({xNV$M91AvJLMU5;Jhdl(Cw+ukt0ix(OOr8Ux zxl;fXT_Cb_0%-1nXdBkT@=(-n#P|weBz$(L}{mOz1UTqNjtw>2r%40S63~I{O3JiFn=iCTO=p*i~xdeNvGmG*4w0X%VunxE=?ndlQ>yw9{&_T5|AFgdk+Op zm!6!1K9D8SGd=bGb%HowT!t*-QVePhm!;lV1wiR#=F6?9B~j*1pMmEuWakgbaZjeo zewlw02bUnb95oRj>8h-E!XzBHRX*|pwn#C^$KPoN5bl>}zK97dAYo7zX|*)!bo5AQN_%IIDA$AP)zwqvG^2@uir!k--dIEpQET1 zK1bg<#gV`;JeMebj6*EJXvLq`52KuEir37~$X&oFaw)_nOjMg6m#>u>JWGvQwlFc< zs?bIq6F+tfF5xa__A0zre8F%DgZ5WE7l#0Y-==)P;@}uCrc5ocA+bM{6RLXf@w6y2 z+tG}{%am(scLNOCsoa&Dh5PJN?z+3sKZzb3Gt^s$LYJ!+bxc7sdsLg&<73usQ~fmj zG0wBm@1eDM;nUR_R6Odts?M}w8`TN*)Rnkyag@5`Ji-nfpe|igg1QH&E2}3Uje2!; z-DF&wW9p`h3Al$h)qnAr7v8FVK3$LX`Bs2YSq)F<>@edzGTwbi+=^j~kR2xvLS z=Ju^Q`m{bKFS+uZ`5AXizkB)H!Y7sOxvoIBPEhlr=B&?VezxrF5}UVbX}+b)!e;+h z6poo=f(XIdnzQ*kbOI?d1TlUdKc$H%Bqk3>+;+k(F>;)VGm*tyxr^}DQmb1_a(Iq) zam3}|j8=0wDYZK}!WxYpC+p^j*~+^)C$T$;v6!`4xKI(X+K7vDyR9~hOY1)uIn+N< zv)nheXre`yt*YtTc-vU-eVOa>Rt2;<*V4TJh(K5#Fb#Ph_<^2nXFnTXMDbJ=;+!4|oQljD(|DJaTaY<1zC zP0JbGR=bUqS+T5$BSzlt;!IldnVpo|J*14axr6DLio89XzfY6Y(4@Ji$P6!hlKrbi zsoyiVIOyW02YNB*Fxo!wh{<7{ZY#?Z6YFLPZ)bxJnw|Di^uX!m8tRgMpvS7bFAYpU z8yr^tyu9QO#j$hW3n;U?i;0UZ<$~4|mUnWjsT}8Fb-5eTho7dy!b2wL$yQTM*V>su m0)|2Uc1>6`&zFB7@8nADUbFxu6Q{i_)8C;R(C}pBQsMt2SP=OD diff --git a/src/resources/translations/rdm_zh_CN.ts b/src/resources/translations/rdm_zh_CN.ts index 164772e9f..324b743ea 100644 --- a/src/resources/translations/rdm_zh_CN.ts +++ b/src/resources/translations/rdm_zh_CN.ts @@ -1,4 +1,6 @@ - + + + AddKeyDialog @@ -384,19 +386,27 @@ + Live update was disabled due to exceeded keys limit. Please specify filter more carrfully or change limit in settings. + + + Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. - 由于超出加载键数量限制，在线更新功能已经关闭。请设置更精确的筛查条件或更改加载限制设定。 + 由于超出加载键数量限制，在线更新功能已经关闭。请设置更精确的筛查条件或更改加载限制设定。 ConnectionsTree::ServerItem - All value and console tabs related to thisconnection will be closed. Do you want to continue? - 所有与该连接相关的键值对话框和命令操作对话框都将被关闭，确定要继续吗？ + 所有与该连接相关的键值对话框和命令操作对话框都将被关闭，确定要继续吗？ - + + Value and Console tabs related to this connection will be closed. Do you want to continue? + + + + Do you really want delete connection? 确定要删除连接？ @@ -494,17 +504,17 @@ 键错误 - + Settings directory is not writable 设置保存文件夹没有写入权限 - + RDM can't save connections file to settings directory. Please change file permissions or restart RDM as administrator. RDM 不能保存设置文件。请更改文件写入权限或者以管理员模式启动 RDM。 - + Please download new version of Redis Desktop Manager: %1 请下载新版本的 Redis Desktop Manager: %1 @@ -535,19 +545,22 @@ - + Connection error: 连接错误： + Value with the same key already exist + + + Value with same key already exist - 相同键已经存在 + 相同键已经存在 - Partial data loaded from server - 已从服务器加载部分数据 + 已从服务器加载部分数据 @@ -575,28 +588,28 @@ 0.9.0 版本以下的 Redis Desktop Manager 不支持老版本的 Redis 服务器 (<2.8)。请使用 0.8.8 的 Redis Desktop Manager 或者升级您的 Redis 服务器。 - + Cannot load keys: %1 无法加载键：%1 - - + + Cannot remove key: %1 无法删除键：%1 - + Delete key error: 删除键错误： - + FlushDB error: 清空库错误： - + Cannot load databases: @@ -606,30 +619,41 @@ - + Connection error. Check network connection 连接错误，请检查网络。 - + Invalid Connection. Check connection settings. 无效连接，请检查连接设置。 - + + Connected to cluster. + + + + + Connected. 已连接。 - + Connection error: 连接错误： - + + Cannot update server info tab. Error: %0 + + + + Server %0 服务器 %0 @@ -679,6 +703,7 @@ 此行数据已经更改，无法删除。请重载后重试。 + Data was loaded from server partially. 部分数据已经从服务器加载。 @@ -750,22 +775,22 @@ 内存占用 - + Mb Mb - + Server Info 服务器信息 - + Property 属性 - + Value 键值 @@ -823,6 +848,11 @@ The row is the last one in the key. After removing it key will be deleted. 此行数据是该键最后一行数据。删除此行数据，该键将会被删除。 + + + Do you really want to remove this row? + + Search on page... @@ -861,9 +891,8 @@ 删除行 - Do you relly want to remove this row? - 确定要删除该行数据吗？ + 确定要删除该行数据吗？ @@ -879,4 +908,4 @@ 无法连接 Redis 服务器 - \ No newline at end of file + diff --git a/src/resources/translations/rdm_zh_TW.qm b/src/resources/translations/rdm_zh_TW.qm index be651eede2edc9cb0da5c140b31664afee169fa8..a59b351b4bfba22f1253ca79a8f00d09f2943a35 100644 GIT binary patch literal 13185 zcmb_C3v^Runt$6Q&9f=B)>1(Jf`zouQgGLSiXf$E5t=>{sMt!mNp9M-X>Q0(`ar8? z1cVAhu~Z&2<6Fm3_iT5@T^&|eT}GLK!3XN-?y56B7@cvCxUL?Lx-R>D|INL*d9`83 zC9)h-1p2owS;KiB1F4{5ZgF>uO!4=B7KW_={x^P zLax7=5bGyIJM$zVWCPJ|TtkTIBcknmgOKUh67As^;P1Cc--X%m{f3Z*=ZW_5Q9|ff zWcG|p38^e6)z5K+%=-~pb;TJ%X1zn|PaY#A_cgNqhzsBs5a(?pfY(fJc-I4b>>}+t z_jCx+r2>FaGV_Z;Xe>k`j@PxM}TMjty%5OPXHf3&I&|=r z2k5_;_0bOCZ^4nQPk!+bAw{2MFWcrMB>%h+s${yRAPsr>yvmY+| z2=LySeaw9x^l~Ws_}%vbpBr-umjPbQl{r^#dYzDIl{rH}(A$jGoL4r2+zVdOOn+2M z$R!Ijfv>gzR+F9iN7 zHftV#6Xd?=3(YSZ?g#n*Q}fh`S3z&5wEU+$;2+ldc7dJ>-_qXp!oPt$o3#6%c@XTj zQTyy`Gl6cQ_Qb^B0^Pf{zqu0i_L}xwZIF;l-Mai^z_-q$bN}go2`LNd?)wJxKYv~B zyg$54$jpk|*3A_7E6#PFsUl>~aBkN#Ujv?(bAvy*9P~OZR}2EZOP~ZbGvEoco69c{q1Qule->(AQ7(S5Uw+_XfT9s{aQ2?$bZ|!G|DEgZ{}4 zTY#TG>Yw=(zpinBKF9PQzIhuVS-0yyd(S|KWs9NsH?zTS9+JKl?;9%FzuOJo z-~ATk{mKyj!F8bbZo~6GH-f*^8D8Ae{IzSp>teZ9u^Usr&>erDvJ1btT38(sTu0ly^1;5qO|qiF1Z5bRL!fbpr9N`U_s z|S76{|NA(S0;Vue`xA?3hbW0+2lV7b}N0>v@hpNu+Oum$H&Xz z@1>?+%>n$`Ri;0_26!(0d(*e(e+7KRY--K|dL`x=C&$2#kDF&TSV8Yz^X$Vr2r2%N zd2Y=?@aMhe#@pcEO-IbUYYphxZyq`Vc3gP9dHkoq?}97L54>?L*y9QF1MmD9zPrr- zoFxMO=cI4(`{qyo?qaZevBgw20d{V+*fxXSa{k>?{sWM2_Pv(M_5ghAEGu?=3j9}D zR=y1Sneo2m_I>vda`6|IyPIplPtIEI{$Ml6F=2UlcpLDQW%-XM!A=)-=3V@A4V){< z+wv;#XZx4D(Y=sQstkEgFZeHzcTV1MAJ|{}W!}3@FM(bSd7n+>!1pVw=AplUy+5$# z zcdK>hovT4#X6th&E(1S5WBqb%3&06JU}8T|A{xi#B!tqPjGQk~PHF&6O`3y^@3dVXJLus0_|yk=hc~z0 zp~9(k4hH!&NOfb8rsb-$x{aJalJ0Qv=v?I8qz*pR$1~B5tAatNAoy#!5L1!fv8eeQ#Hc_QtQiOjp)idi@d*JDB}@Wr z&uix60oV3s0;n0OyfvUu(>wTZ*ca$bNyF@Tvt#R_^L;zU)Yi#c<@JJeyodJigCbLD zVQs|U(-`DKTp0OPxj>$4@W9KS(~a$IdtLd}*$UlagrEut_4)!nv5WUqp{(iArFFhZ zKn9MD>{IBPL9Je2sFyK1IW66u+}+=eMHEoOY9TntWS$((y!QluWb6q)G1>MOeMtTI5#>#%0a13WDRK`v}<{X)xEpNsE9tt))>U7I=}OH4PM{=fWs&aV+1kl+YO$#+RlhH28emiw9mk7*vQ|rXto9^7V0&%YIMfn*HN< z#F3k;CKqw}eQpep3#E3MO1Pw~ezf(DwQVmBJgtbhNJTS**}YO^*`0ErTs{!?xuq}( za-!HTggjF#SJztIdbP>}^iW7cyeOsC$?c*)`qofMTtc6=%F~A>*#kuJ~>T2);ylXE5IzdZ)Zxri`NYB?g%CfdZBC=bl)FX*iyZ6(kbOo``z3b1U)4!ofN0rUOBE~{yAa4AtTY41+Kwtf*^TR_wyY*D zwd$KP&Y8vPdMB5medjt3DD+F4xNsM?;D1FODs<;h2>Jg zIirQ|6`;$g7sN2__kqbBj(W&4^1wBD%;d?~6H2fdkz`(m%`%$Nl2M1knh}vWBQOiH z`FL_p3S<TVQ6!7lTvw>EBjY6sM} z?P>0cORF$sx+B5i3F>;4qiGij; z_Sp>kyQ1U)D=ueDQ)gt_1({=NP757>vXdqgt}=Sut+vr6yVu(*6+SCg1qA5+L$M)} z!rBL%J_Hj144mMd!I032T|JVT6>APfXNc!(YUDY3ZJ6(6i=jDKO!sWZHNZ$n8p?OS zcgW?sy3>IBm<=zfrrTwyr`r%@#y+0H#LKo8QZWj50b`!%E`m+E88BlUi`@A6(3ty7 zGp~qjfyN64X_0asD0dl3RUskj{kG-a>g+>g&-MeS`3WqrvWzI3(-J4$$~Zz*G%Bn- z!-se*xRQjRW|74#xcG(22ur}Yb)^x=ijds8jMY{$a%wogT$J9ft0Fkz$iH%)$?gY{BB2eUy0=1@Q7lAN;N z2hQN)rFC0$+m?xBF=xbpSGitU3fJ>Ut17p&1%*k1x!H^)pO?0xipRq;V{m)K*1atB z+@8Byi|l9JuN-}A%lzT*NV%fOa$B9GIc)5Fy%1BN*Dyp-pAQ<{=sE|--*R-wylY`B z;QVqwFYTo5rw+vogIiS|I&6SQ2fzl-mP>ZW_PhBiNhpSII?!U5WBd+T9`tMXotyW! z+%x>0B2USh0Qv!XFBM_y3!7NX6(~_Ur24kjqpxq8-)>cq7_Jduo#pUtOAAvdd#1N` zd<>E;8&(zgQnh#b0?^XJs77rpn81i0F|9I-WW1eZ)BNUDBa6o({J?>i70gtPxtAO8 z^+tLz9|`@@205LODMyJ^<}5mJdcVP2i)jRvEtf!r185InuNR0FJCVXTDP#?p@O=ZkpQZa$P}zrL!?C7`>twbw!Y|P^t8_bnoE*+l zZJ%&o4_#oIvTcMQ$P227-|=qf#I*OfmnRFNs?7IVGM+JVd1n%|=klip)V2_>xK_1eVw&rov3ncJpF`R_>fz#+c3A`)N*e#`Dy$C6z zrN$zxm2na$S+5cxDnD#KB=*Dp6zpGtNTg8{0u;7AgvO8&3infHOuc!AIYGgcP5lN);(W?=ArQOnYeXDIG1Q$!@ky9AMC|vilj=cv?k9bx0M7)}s zBo5RsHwRrTg*xXEcoBVzAMiov2|*__R7IoZFxnodG=Rw!N}~s|>>%YjVdKLto#MRl zvSilP+Gjx$)BWOPCNEUy1u=qn6&V+U(-YA{dWP%Cv_U9&Q38^}1SDcgcxHM`qkF!i@Mw=umL*<*cC>q?A zvOcj2*#mEk*H2Y)vMY+w7&+B_f9KhuU+g=l!d#I8a~BV*lK>xvJB1!qKqqP6sNjxW zs8378$AjTNCHb1rDXKu79A!EYT1(6Qi9uXvAV|Q##W0LWOg#IM=NE~wv>tr=19jzTXWjF0N@Dri>&V{TPscy$e9lU=KNe>AV zfdnDHHxP~l;HMM*9*UNy*p^b6YhR{!a|TXZ~ zLMc;JJq-7Cc++XO41b5OK~S6B2dlG3PQmQ8tovZwCooPfcAV=mx{8Li_OmzL7uGr7 z>n`oEZs=%v12|>yD*gAh)HP5yi(C=jlc<7Agh2_qbMOx+-t3tK_4q>2@d%+orNX$o zxIib4RB#d|kY1mNLP4Jyf<9AZyG|s)Cgomy<^anUK#*+5w@EdrBFo^Xno!ia{jA+| zfqDn6@Qd7E3}>aXnG~F$0UKFPmH?flq#X5zD@XV%QeVn`q}C&IYg5#;58jpb=9(}YNeoyksy1_BKSSBn}9~Wal3SCTTYi$EiG3pflWaw z?A29EtCpfYBEilOEa&kl02(K@mQOZ@Sy5IQsaA52L7G`YM7FP!S>i zX&3mNi-!qFa#IiMd?aUwJ%E(xWK6GniPMd0OxeO*h#dGnS>9Ovw3o9p{c{U(S7^>yotS|0YLu)h&;JWrXas0~8A z9J-+%Xf2@!7vMPwjPYOtslCZ(Hy`ZcL-jbS0+>)9kxkCB;y|%0x-3EC6BfW}9MaX>P=NLeeS`;7?+%|b=FVjmpQrS(*mGfHI z(?_KBQwrizFU?~D&OCl1HqNVd1A4rmhjE=XhpTGtB`DTDV?^d>VxKtg2$QI)RuOi!Y>Ywt7)Ob8%S)%1uEn9|6?+8U+ZV zOxn|=2GmP5R3_AeD7 z%<^nti+9*qas}9h`2G) Ndn0~T7oHZ){{h!W72W^< literal 16 YcmcE7ks@*G{hX<16=n7(EZln+07b?KzW@LL diff --git a/src/resources/translations/rdm_zh_TW.ts b/src/resources/translations/rdm_zh_TW.ts index 241b8aaf5..d61f6351e 100644 --- a/src/resources/translations/rdm_zh_TW.ts +++ b/src/resources/translations/rdm_zh_TW.ts @@ -6,32 +6,32 @@ Key: - + 鍵： Type: - + 類型： Value: - + 鍵值： Save - + 保存 Cancel - + 取消 Error - + 錯誤 @@ -39,24 +39,24 @@ Connect to Redis Server - + 連接 Redis 伺服器 Import Connections - + 導入連接 Export Connections - + 匯出連接 Settings - + 設置 @@ -64,67 +64,67 @@ Delete keys - + 刪除鍵 Copy keys - + 複製鍵 Redis Server: - + Redis 伺服器： Database number: - + 資料庫編號： Key pattern: - + 鍵名運算式： Destination Redis Server: - + 目標 Redis 伺服器： Destination Redis Server Database Index: - + 目標資料庫編號： Affected keys: - + 受影響的鍵： Bulk Operation finished. - + 批量操作完成。 Delete Keys - + 刪除鍵 Cancel - + 取消 Confirmation - + 確認 Do you really want to perform bulk operation? - + 確認要執行批量操作？ @@ -132,218 +132,218 @@ New Connection Settings - + 新連接設置 Edit Connection Settings - %1 - + 編輯連接設置 - %1 Connection Settings - + 連接設置 Main Settings - + 通用設置 Name: - + 名稱： Connection Name - + 連接名稱 Address: - + 地址： redis-server host - + Redis 伺服器地址 Auth: - + 驗證： (Optional) redis-server authentication password - + (可選) Redis 伺服器驗證密碼 Security - + 安全設置 None - + 無 SSL - + SSL Public Key: - + 公開金鑰： (Optional) Public Key in PEM format - + (可選) PEM 格式公開金鑰 Select public key in PEM format - + 選擇 PEM 格式公開金鑰 Private Key: - + 私密金鑰： (Optional) Private Key in PEM format - + (可選) PEM 格式私密金鑰 Select private key in PEM format - + 選擇 PEM 格式私密金鑰 Authority: - + 授權： (Optional) Authority in PEM format - + (可選) PEM 格式授權 Select authority file in PEM format - + 選擇 PEM 格式授權檔 SSH Tunnel - + SSH 通道 SSH Address: - + SSH 地址： Remote Host with SSH server - + SSH 遠端伺服器地址 SSH User: - + SSH 用戶： Valid SSH User Name - + 有效的 SSH 用戶名 Private Key - + 私密金鑰 Path to Private Key in PEM format - + PEM 格式私密金鑰路徑 Password - + 密碼 SSH User Password - + SSH 使用者密碼 Advanced Settings - + 高級設置 Keys glob-style pattern: - + 鍵名匹配萬用字元： Pattern which defines loaded keys from redis-server - + 指定載入鍵名運算式： Namespace Separator: - + 命名空間分隔符號號： Separator used for namespace extraction from keys - + 鍵名中命名空間分隔符號號 Connection Timeout (sec): - + 連接逾時 (秒)： Execution Timeout (sec): - + 執行超時 (秒)： Invalid settings detected! - + 檢測到無效的設置！ Test Connection - + 測試連接 Quick Start Guide - + 快速入門指南 OK - + 確定 Cancel - + 取消 @@ -351,56 +351,64 @@ Key was added. Do you want to reload keys in selected database? - + 鍵已經添加。需要重新載入該資料庫的鍵名嗎？ Key was added - + 鍵已經插入 Another operation is currently in progress - + 另一個操作正在進行中 Please wait until another operation will be finised. - + 請耐心等待另一個操作完成。 Do you really want to remove all keys from this database? - + 確定要刪除該資料庫裡面所有的鍵嗎？ Keys error - + 鍵錯誤 Live update was disabled - + 同步更新已經禁止 - Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. + Live update was disabled due to exceeded keys limit. Please specify filter more carrfully or change limit in settings. + + Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. + 由於超出載入鍵數量限制，同步更新功能已經關閉。請設置更精確的篩查條件或更改載入限制設定。 + ConnectionsTree::ServerItem - All value and console tabs related to thisconnection will be closed. Do you want to continue? + 所有與該連接相關的鍵值對話方塊和命令操作對話方塊都將被關閉，確定要繼續嗎？ + + + + Value and Console tabs related to this connection will be closed. Do you want to continue? - + Do you really want delete connection? - + 確定要刪除連接？ @@ -408,58 +416,58 @@ Settings - + 設置 Appearance - + 介面 Font Size - + 字體大小 in pixels - + 以圖元計算 Connections Tree - + 連接列表 Reopen namespaces on reload - + 重載時重新打開命名空間 (Disable to improve treeview performance) - + (禁用樹狀視圖以提高性能) Enable key sorting in tree - + 打開樹狀視圖鍵名排序功能 Live update maximum allowed keys - + 同步更新最大允許鍵數量 Live update interval (in seconds) - + 同步更新時間 (秒) OK - + 確定 @@ -467,12 +475,12 @@ Page - + 頁 Set Page - + 設置頁碼 @@ -480,7 +488,7 @@ Show password - + 顯示密碼 @@ -488,27 +496,27 @@ Do you really want to delete this key? - + 確定要刪除該鍵？ Key error - + 鍵錯誤 - + Settings directory is not writable - + 設置保存資料夾沒有寫入許可權 - + RDM can't save connections file to settings directory. Please change file permissions or restart RDM as administrator. - + RDM 不能保存設置檔。請更改檔寫入許可權或者以管理員模式啟動 RDM。 - + Please download new version of Redis Desktop Manager: %1 - + 請下載新版本的 Redis Desktop Manager: %1 @@ -520,7 +528,7 @@ Invalid row - + 無效行 @@ -537,160 +545,178 @@ - + Connection error: - + 連接錯誤： - Value with same key already exist + Value with the same key already exist - + Value with same key already exist + 相同鍵已經存在 + + Partial data loaded from server - + 已從伺服器載入部分資料 Cannot load key %1, connection error occurred: %2 - + 無法載入鍵 %1，連接發生錯誤：%2 Cannot load key %1 because it doesn't exist in database. Please reload connection tree and try again. - + 無法載入鍵 %1，資料庫中不存在該鍵，請重載連接樹後重試。 Cannot load TTL for key %1, connection error occurred: %2 - + 無法載入鍵 %1 的 TTL 值，連接發生錯誤: %2 Cannot retrive type of the key: - + 無法獲取鍵類型： RedisDesktopManager >= 0.9.0 doesn't support old versions of redis-server (< 2.8). Please use RedisDesktopManager 0.8.8 or upgrade your redis-server. - + 0.9.0 版本以下的 Redis Desktop Manager 不支援老版本的 Redis 伺服器 (<2.8)。請使用 0.8.8 的 Redis Desktop Manager 或者升級您的 Redis 伺服器。 - + Cannot load keys: %1 - + 無法載入鍵：%1 - - + + Cannot remove key: %1 - + 無法刪除鍵：%1 - + Delete key error: - + 刪除鍵錯誤： - + FlushDB error: - + 清空庫錯誤： - + Cannot load databases: - + 無法載入資料庫： + + - + Connection error. Check network connection - + 連接錯誤，請檢查網路。 - + Invalid Connection. Check connection settings. + 無效連接，請檢查連接設置。 + + + + Connected to cluster. + - + Connected. - + 已連接。 + - + Connection error: + 連接錯誤： + + + + Cannot update server info tab. Error: %0 - + Server %0 - + 伺服器 %0 Cannot open value tab - + 無法打開鍵值對話方塊 Connection error. Can't open value tab. - + 連接錯誤，無法打開鍵值對話方塊。 Can't add new key: - + 無法添加新鍵名： Can't rename key: - + 無法重命名鍵名： Can't remove key: - + 無法刪除鍵名： Can't set key ttl: - + 無法設置鍵的 TTL： Can't close key tab: - + 無法關閉鍵標籤： The row has been changed and can't be updated now. Reload and try again. - + 此行資料已經更改，無法更新。請重載後重試。 The row has been changed and can't be deleted now. Reload and try again. - + 此行資料已經更改，無法刪除。請重載後重試。 + Data was loaded from server partially. - + 部分資料已經從伺服器載入。 Bulk operation error: %1 - + 批量操作錯誤：%1 Cannot load key value: %1 - + 無法載入鍵值：%1 @@ -698,22 +724,22 @@ Explore Redis Desktop Manager - + Redis Desktop Manager Before using Redis Desktop Manager (RDM) take a look on the %1 - + 在使用 Redis Desktop Manager (RDM) 之前，您可以先看看 %1 Quick Start Guide - + 快速入門指南 OK - + 知道了 @@ -721,52 +747,52 @@ Redis Version - + Redis 版本 Used memory - + 已使用記憶體 Clients - + 連接數 Commands Processed - + 已執行命令 Uptime - + 執行時間 Memory Usage - + 記憶體佔用 - + Mb - + Mb - + Server Info - + 伺服器資訊 - + Property - + 屬性 - + Value - + 值 @@ -774,95 +800,99 @@ TTL: - + TTL： New name: - + 新名稱： Delete - + 刪除 Delete key - + 刪除鍵 Do you really want to delete this key? - + 確定要刪除該鍵？ Reload Value - + 重載鍵值 Set TTL - + 設置 TTL Set key TTL - + 設置鍵的 TTL New TTL: - + 新的 TTL： The row is the last one in the key. After removing it key will be deleted. + 此行資料是該鍵最後一行資料。刪除此行資料，該鍵將會被刪除。 + + + + Do you really want to remove this row? Search on page... - + 頁面搜索... Save - + 保存 Nothing to save - + 不需要保存 Value was updated! - + 鍵值已經更新！ Save value - + 保存鍵值 Add Row - + 插入行 Delete row - + 刪除行 - Do you relly want to remove this row? - + 確定要刪除該行資料嗎？ @@ -870,12 +900,12 @@ Successful connection to redis-server - + 連接成功！ Can't connect to redis-server - + 無法連接！ From 578b1b708a7466d3b08da48a63c2ff1b55f5a401 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 13:27:29 +0200 Subject: [PATCH 4/9] Add sentinel support in connections tree module --- src/app/models/treeoperations.cpp | 8 +++++++- .../connections-tree/items/serveritem.cpp | 2 ++ src/modules/server-stats/serverstatsmodel.cpp | 7 +++++-- src/resources/images.qrc | 1 + src/resources/images/sentinel.svg | 17 +++++++++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 src/resources/images/sentinel.svg diff --git a/src/app/models/treeoperations.cpp b/src/app/models/treeoperations.cpp index bf1aede7e..79fd6821f 100644 --- a/src/app/models/treeoperations.cpp +++ b/src/app/models/treeoperations.cpp @@ -163,5 +163,11 @@ void TreeOperations::flushDb(int dbIndex, std::function ca QString TreeOperations::mode() { - return m_connection->mode() == RedisClient::Connection::Mode::Cluster? QString("cluster") : QString("standalone"); + if (m_connection->mode() == RedisClient::Connection::Mode::Cluster) { + return QString("cluster"); + } else if (m_connection->mode() == RedisClient::Connection::Mode::Sentinel) { + return QString("sentinel"); + } else { + return QString("standalone"); + } } diff --git a/src/modules/connections-tree/items/serveritem.cpp b/src/modules/connections-tree/items/serveritem.cpp index 7b3a9183f..de22e8a17 100644 --- a/src/modules/connections-tree/items/serveritem.cpp +++ b/src/modules/connections-tree/items/serveritem.cpp @@ -75,6 +75,8 @@ QString ServerItem::getIconUrl() const if (isDatabaseListLoaded()) { if (m_operations->mode() == "cluster") { return QString("qrc:/images/cluster.svg"); + } else if (m_operations->mode() == "sentinel") { + return QString("qrc:/images/sentinel.svg"); } else { return QString("qrc:/images/server.svg"); } diff --git a/src/modules/server-stats/serverstatsmodel.cpp b/src/modules/server-stats/serverstatsmodel.cpp index 798dc417e..484409bad 100644 --- a/src/modules/server-stats/serverstatsmodel.cpp +++ b/src/modules/server-stats/serverstatsmodel.cpp @@ -12,9 +12,12 @@ ServerStats::Model::Model(QSharedPointer connection) QList rawCmd {"INFO", "all"}; m_connection->command(rawCmd, this, [this](RedisClient::Response r, QString err) { - // TODO: emit error - m_serverInfo = RedisClient::ServerInfo::fromString(r.toRawString()).parsed.toVariantMap(); + if (err) { + emit error(QObject::tr("Cannot update server info tab. Error: %0").arg(err)); + return; + } + m_serverInfo = RedisClient::ServerInfo::fromString(r.toRawString()).parsed.toVariantMap(); emit serverInfoChanged(); }); diff --git a/src/resources/images.qrc b/src/resources/images.qrc index 09727c198..25eb31545 100644 --- a/src/resources/images.qrc +++ b/src/resources/images.qrc @@ -33,5 +33,6 @@ images/live_update_disable.svg images/copy.svg images/cluster.svg + images/sentinel.svg diff --git a/src/resources/images/sentinel.svg b/src/resources/images/sentinel.svg new file mode 100644 index 000000000..93413501b --- /dev/null +++ b/src/resources/images/sentinel.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From 8cb6ed58c836c8df1be3a9ae7c1260ace41f6dac Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 13:29:05 +0200 Subject: [PATCH 5/9] Update qredisclient --- 3rdparty/qredisclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient index 32a2697c7..a28f13f38 160000 --- a/3rdparty/qredisclient +++ b/3rdparty/qredisclient @@ -1 +1 @@ -Subproject commit 32a2697c73e2bf224d3c6cde7152ac9a8d33af3d +Subproject commit a28f13f380717a89f21c6de41aea66ea5f3da4a5 From c202fece87403fb61e05bd255ed9b0cd0eed5403 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 14:03:47 +0200 Subject: [PATCH 6/9] Fix ts files --- src/resources/translations/rdm_zh_CN.ts | 28 ++++--------------------- src/resources/translations/rdm_zh_TW.ts | 28 ++++--------------------- 2 files changed, 8 insertions(+), 48 deletions(-) diff --git a/src/resources/translations/rdm_zh_CN.ts b/src/resources/translations/rdm_zh_CN.ts index 324b743ea..a1bfd63f9 100644 --- a/src/resources/translations/rdm_zh_CN.ts +++ b/src/resources/translations/rdm_zh_CN.ts @@ -387,23 +387,15 @@ Live update was disabled due to exceeded keys limit. Please specify filter more carrfully or change limit in settings. - - - - Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. - 由于超出加载键数量限制，在线更新功能已经关闭。请设置更精确的筛查条件或更改加载限制设定。 + 由于超出加载键数量限制，在线更新功能已经关闭。请设置更精确的筛查条件或更改加载限制设定。 ConnectionsTree::ServerItem - - All value and console tabs related to thisconnection will be closed. Do you want to continue? - 所有与该连接相关的键值对话框和命令操作对话框都将被关闭，确定要继续吗？ - Value and Console tabs related to this connection will be closed. Do you want to continue? - + 所有与该连接相关的键值对话框和命令操作对话框都将被关闭，确定要继续吗？ @@ -552,15 +544,7 @@ Value with the same key already exist - - - - Value with same key already exist - 相同键已经存在 - - - Partial data loaded from server - 已从服务器加载部分数据 + 相同键已经存在 @@ -851,7 +835,7 @@ Do you really want to remove this row? - + 确定要删除该行数据吗？ @@ -890,10 +874,6 @@ Delete row 删除行 - - Do you relly want to remove this row? - 确定要删除该行数据吗？ - app diff --git a/src/resources/translations/rdm_zh_TW.ts b/src/resources/translations/rdm_zh_TW.ts index d61f6351e..270d5c4c2 100644 --- a/src/resources/translations/rdm_zh_TW.ts +++ b/src/resources/translations/rdm_zh_TW.ts @@ -387,23 +387,15 @@ Live update was disabled due to exceeded keys limit. Please specify filter more carrfully or change limit in settings. - - - - Live update was disabled due to exceeded keys limit. Please specify more accurate filter or change limit in settings. - 由於超出載入鍵數量限制，同步更新功能已經關閉。請設置更精確的篩查條件或更改載入限制設定。 + 由於超出載入鍵數量限制，同步更新功能已經關閉。請設置更精確的篩查條件或更改載入限制設定。 ConnectionsTree::ServerItem - - All value and console tabs related to thisconnection will be closed. Do you want to continue? - 所有與該連接相關的鍵值對話方塊和命令操作對話方塊都將被關閉，確定要繼續嗎？ - Value and Console tabs related to this connection will be closed. Do you want to continue? - + 所有與該連接相關的鍵值對話方塊和命令操作對話方塊都將被關閉，確定要繼續嗎？ @@ -552,15 +544,7 @@ Value with the same key already exist - - - - Value with same key already exist - 相同鍵已經存在 - - - Partial data loaded from server - 已從伺服器載入部分資料 + 相同鍵已經存在 @@ -851,7 +835,7 @@ Do you really want to remove this row? - + 確定要刪除該行資料嗎？ @@ -890,10 +874,6 @@ Delete row 刪除行 - - Do you relly want to remove this row? - 確定要刪除該行資料嗎？ - app From 79383488077310d007c0fe7acb70d290c91fbe46 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 14:27:09 +0200 Subject: [PATCH 7/9] Fixes --- src/modules/server-stats/serverstatsmodel.cpp | 2 +- src/resources/translations/rdm_zh_CN.qm | Bin 13165 -> 13830 bytes src/resources/translations/rdm_zh_TW.qm | Bin 13185 -> 13854 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/server-stats/serverstatsmodel.cpp b/src/modules/server-stats/serverstatsmodel.cpp index 484409bad..e51452a7a 100644 --- a/src/modules/server-stats/serverstatsmodel.cpp +++ b/src/modules/server-stats/serverstatsmodel.cpp @@ -12,7 +12,7 @@ ServerStats::Model::Model(QSharedPointer connection) QList rawCmd {"INFO", "all"}; m_connection->command(rawCmd, this, [this](RedisClient::Response r, QString err) { - if (err) { + if (!err.isEmpty()) { emit error(QObject::tr("Cannot update server info tab. Error: %0").arg(err)); return; } diff --git a/src/resources/translations/rdm_zh_CN.qm b/src/resources/translations/rdm_zh_CN.qm index 2ba08e0a85080fb9871697fa484292ad9206553e..8bb23244baf6215ceab71bb176359db7033a63d9 100644 GIT binary patch delta 1587 zcmX|=c~BE~6vtnZ-E58x!Ey)zVGV*D5~wXYmda(Jl~DwWph6i#vVp*|iMfz!z#^z^ zq=GS?E!299TI#5@qt$w25k|+WsGad>N2$|kfoioCkJ6WB#y>J|cJupv-}n1@Z-)%4 zxVFH?rvT(sfOrSiQ~)}}S5=g+#%%>yupB^n1<3Gz0GJPCaW;T_5Xi~_0M#!*Za#oHC2(x}gUM=qI}8 zeu?1j6GwWl03_2SJIn%vs!8Lj3V^`<_-CX2<}pCPcgSn=~oJqS=u#oWCEjWFR1RZ`9% zokNuFss>mY=% zUm=e^fbbtGV#^Vd=#C<8x(Z<8n~KCT9*x~pq%{xYXLLr9ehFbr_)xLBwG$w?U(r#J zh0E>O9mm@JI0 zO3PQWzFUluXRNHvX5=fa8u!W2$?go*U}H{2Mx`{*&o#L2j&7IZX@S+z?9t@ET{`Nz zU6oU`w#b=xUw?64neVynWtn)*SKeS_^isZb>&G88JZKmy8b22K%KV~YEr-Unyq=k5 z;;kkQLuf0kjD_X2HcWwuY*j`pqcib5tFt8-O*~U)iTuc%R`shNI>^Sq!ra$=2KA8BqiP&@Wj&0pubfpz0;k1Tc8W7?kZTfCj8 z9Vz)25Ke0^b)KY>Md$MbZwuMF)Pie(r%AWJIs-6UbyxB@dF-cxf1gN}M?%#q)zoyM z=9ry{EDMbdyMTaVp|Och0y>3`%nNi17itf=P`^XykLyMqV#0*}`BK2!DGX+R!6=u6 z;mH{w-XWH)lmY8=#fqk4z~_uuKk+jK6UC25yC}3y{B|}Fa9d5rgu>xJ<)CRV0Twvi{) zrZ3<4Hz2j^`)(}JP^NxpClj&s=tozWyH~jWn(#ameM`SI?-WZ zUk_+<4ds`oX>rK#c1jkNHyFlF8`++%hVKg&xXD)xm(81iumQtr+GaMO!k9Qg#mHsj z#_N{=U6(Qaf2=eXj>m8}EykiDMwk#{EN(f#D8`M|ci1B1KI1!GrEp~F{ObZ1vi~Ue6lYP| zKj&~UYs#s)XNd1Ar+)d9xJ@~)*+YSG7y6x3Rt9_-!lFqIKg*&8o1*LtNw;WAzo1j-CIB8tB#*> zzYu$u8~wx4E+lOC%~De}p|o^GO|K%e``7B$!z`LDQLP*!laIIhW^*O2daDN-)2KMB zHXeD3#aUD@PKL383+nyMT;6-Rf;*@k^b()*b?h?V9P|we^%!i9?-K?;NUGKS2SA@J AMF0Q* diff --git a/src/resources/translations/rdm_zh_TW.qm b/src/resources/translations/rdm_zh_TW.qm index a59b351b4bfba22f1253ca79a8f00d09f2943a35..3a08dd5195a60369b44b1e4814300f2282f782e3 100644 GIT binary patch delta 1612 zcmX|Ac}&xH6n{N_{CfOKodSab@)Jb4T5!uWjtPRtl!yZ16h`dvEfh@>JDaPmR0|kXr?yd;nC?2moXOmAwc+J_c0LC_rE!P+NwuU*oA7 z7uJ^mu~k4FXaxv82O)t|@p~7Z{_Ihf`wEe=a z@G*RC6!z&S0K{Jj2Re5mQWZlqAGl@!m@+QzN&Oas zdni6O{3}4*5{f(`00EhlX{`>x=QpZ;=y!xwQyWk2#-N?lk5_^a-iI1K_z}YQQ)l9v zFu*I+Id96f;W zK0PY$N1QH+c(4ugS|gdw;#{~!Vx0F60No;4Q~em={X9wc?K@~RRdO_Il^B&C<{O1G zT%k^>{~33llvI7K9zd{MYCL}yb*QBFIVsp5llJeE;l(VJ{+xFMw>MdOK5#z3jN{T5 z2}!thy)1SJd7_re=G`0s5bcm9zO6=C!C({y^_@(66oZT#lIdD%Fp#UVvd4HiGEP>p z+W>r&D8LnTPrhs~UV?YHr$*88)yHs$lM3bL5nN6fFK-b&#U=3a1MQL6pC<1OMJ%C4 ze(Op%TB(=6VtzvHz{t}Dh^=A*M|ixz0VX(AiC#7^AzKyP_b_c6x>91@)NRMipY(f7U>!b62T z{2(4xv?8JqLlRwAM9xtGOtUN01s1ISiiCzoXh5h)yo6x{A5pAp*$&`0uINlp2AJBb z=)7IXCy7HRNB!m9+Km6?xV7FVqW{J{KI0u?%?dxeGF}jdmPV9`7DV>Gpj=#s=N6i% zEa^uipLxpCbtPz3uB>THK*rn3#!UGy~sRO#rhP-bx4eD5-p3 zSFU3gInmOX{&J%-7jTE^@NCX-oBjN{~B#`Z5>fA*xBZ@BpgQovPx&%aIbj`T2Cbd26I$5L1Y$rCh)M_KF zUTd=%9cHtWwc1#HvDQ*VJg-=jh2@CdZn6|{8lDN5$(N|^x>9uWi==gQldUyOzo-0p z`;GDj-jVi6fud;*>CH{aY|gA+e#dZOMZy1_*4G8}`u%Rh6HH}a{?-k(HB~juSr;cl z-kDmNtu;FctF;)|1y&1ZH51mZ)p4win9-)e?aE$k;#j@a5^EuPyUA){D@!<~G7ZcfBI;&2afg~?uw4499$ zl(=(awPqX98k`uWiL>``(Y<0{Kaco~sLh5Z+xlhA!=xkYBHtYz%J1-}rEm4wtQCoT MQtXtTn7Ay_e`cQR-2eap delta 1118 zcmX9-eN2>f0DkW7eR=QheUBFr^5FPJ;P^V5PFyh{Q4=jPYJeEK1qYZ&#K6|tf>Zf$ zb0Qxn3udCG7%^HFY!FF6hzQvJoEifEDq&%Cc0zlC8UzMdz{C1ivm3SQRUjE>lg-7Rry? zf#^t~w&qR1zg4KMV-o)vp>^8@CWRZdm2T9h3EgoWa3aPobk7w4D<23w=^wMo--Z71 z9~k{Rv2dx70{g{1b@_nLb+LNvN7~L28wSs^`Yds1I)K7H;`sUX6mAzUCmyEGw0J+Y z3~cn#3FM}ddq*MEVCa*xxGSz**mQsm8FfPfe&+aBViL$lG~PrbvEkKFU-06wJV(=9R~B|U^34e;^(RX z%`1kYD-(?P$gpq2c6MEC82Qx5^=vj=%K4d2S`1e#F953-4a>OcS|(SL*=i+$fdQ(x2C(8?sNHx@-4kXkux;p z_E#*EF0OG@2~1bnYLOD$S_7DmD&fx`<0_9RJF5A++@=)fZ{ZI7N|eerzEj*zrR4<8 z#U?0cX1B7GUggYYfS|OhTUkMSC&5W<-3|qa>RK)W46g^XGyxBOwk+sf#6f7 z_}o(BW>a#_5(C&wDOXvBW!`kC{v_c0z|@|R${pM>wcob8@`NyN>o=Z_NBFO{89Xn< z{>e;Xt`@oKhcddyV(r*+cFISA!JTvqpTw*LB!(r)N{(das`G_)ei`Vr{1GKgszl AivR!s From 19f47fd7a3b82e2629c178c93286f414e74a0a34 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 14:52:59 +0200 Subject: [PATCH 8/9] Add ability to change language in Settings dialog #3753 --- src/app/app.cpp | 20 +++++++++--- src/qml/GlobalSettings.qml | 20 +++++++++++- src/qml/settings/ComboboxOption.qml | 8 ++++- src/resources/translations/rdm.ts | 42 ++++++++++++++++++------- src/resources/translations/rdm_zh_CN.ts | 42 ++++++++++++++++++------- src/resources/translations/rdm_zh_TW.ts | 42 ++++++++++++++++++------- 6 files changed, 134 insertions(+), 40 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index 881314b19..a86bbf455 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -206,14 +206,24 @@ void Application::initUpdater() void Application::installTranslator() { - QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" ); + QSettings settings; + QString preferredLocale = settings.value("app/locale", "system").toString(); + + QString locale; + + if (preferredLocale == "system") { + settings.setValue("app/locale", "system"); + locale = QLocale::system().uiLanguages().first().replace( "-", "_" ); - qDebug() << QLocale::system().uiLanguages(); + qDebug() << QLocale::system().uiLanguages(); - if (locale.isEmpty() || locale == "C") - locale = "en_US"; + if (locale.isEmpty() || locale == "C") + locale = "en_US"; - qDebug() << "Detected locale:" << locale; + qDebug() << "Detected locale:" << locale; + } else { + locale = preferredLocale; + } QTranslator* translator = new QTranslator((QObject *)this); if (translator->load( QString( ":/translations/rdm_" ) + locale )) diff --git a/src/qml/GlobalSettings.qml b/src/qml/GlobalSettings.qml index c18d6dc7e..6562064e0 100644 --- a/src/qml/GlobalSettings.qml +++ b/src/qml/GlobalSettings.qml @@ -18,6 +18,23 @@ Dialog { anchors.fill: parent anchors.margins: 20 + Text { + text: qsTr("General") + font.pixelSize: 20 + } + + ComboboxOption { + id: appLang + + Layout.fillWidth: true + Layout.preferredHeight: 40 + + model: ["system", "en_US", "zh_CN", "zh_TW"] + value: "system" + label: qsTr("Language") + description: qsTr("Application restart is needed to apply this setting.") + } + Text { text: qsTr("Appearance") font.pixelSize: 20 @@ -31,7 +48,7 @@ Dialog { value: "Open Sans" model: Qt.fontFamilies() - label: "Font" + label: qsTr("Font") description: "" } @@ -126,5 +143,6 @@ Dialog { property alias liveUpdateInterval: liveUpdateInterval.value property alias appFont: appFont.value property alias appFontSize: appFontSize.value + property alias locale: appLang.value } } diff --git a/src/qml/settings/ComboboxOption.qml b/src/qml/settings/ComboboxOption.qml index 8e16d1361..ef335cc3b 100644 --- a/src/qml/settings/ComboboxOption.qml +++ b/src/qml/settings/ComboboxOption.qml @@ -28,7 +28,7 @@ Item { } Text { - color: "#cccccc" + color: "grey" text: root.description } } @@ -48,6 +48,12 @@ Item { currentIndex = val.find(root.value) } } + + Component.onCompleted: { + if (model) { + currentIndex = val.find(root.value) + } + } } } } diff --git a/src/resources/translations/rdm.ts b/src/resources/translations/rdm.ts index 7adeae06d..65dd35a31 100644 --- a/src/resources/translations/rdm.ts +++ b/src/resources/translations/rdm.ts @@ -412,52 +412,72 @@ + General + + + + + Language + + + + + Application restart is needed to apply this setting. + + + + Appearance - + + Font + + + + Font Size - + in pixels - + Connections Tree - + Reopen namespaces on reload - - + + (Disable to improve treeview performance) - + Enable key sorting in tree - + Live update maximum allowed keys - + Live update interval (in seconds) - + OK @@ -506,7 +526,7 @@ - + Please download new version of Redis Desktop Manager: %1 diff --git a/src/resources/translations/rdm_zh_CN.ts b/src/resources/translations/rdm_zh_CN.ts index a1bfd63f9..7483e86bc 100644 --- a/src/resources/translations/rdm_zh_CN.ts +++ b/src/resources/translations/rdm_zh_CN.ts @@ -412,52 +412,72 @@ + General + + + + + Language + + + + + Application restart is needed to apply this setting. + + + + Appearance 界面 - + + Font + + + + Font Size 字体大小 - + in pixels 像素 - + Connections Tree 连接树 - + Reopen namespaces on reload 重载时重新打开命名空间 - - + + (Disable to improve treeview performance) (禁用树状试图提高性能) - + Enable key sorting in tree 打开树状试图键名排序功能 - + Live update maximum allowed keys 在线更新最大允许键数量 - + Live update interval (in seconds) 在线更新间隔 (秒) - + OK 好 @@ -506,7 +526,7 @@ RDM 不能保存设置文件。请更改文件写入权限或者以管理员模式启动 RDM。 - + Please download new version of Redis Desktop Manager: %1 请下载新版本的 Redis Desktop Manager: %1 diff --git a/src/resources/translations/rdm_zh_TW.ts b/src/resources/translations/rdm_zh_TW.ts index 270d5c4c2..6fb108982 100644 --- a/src/resources/translations/rdm_zh_TW.ts +++ b/src/resources/translations/rdm_zh_TW.ts @@ -412,52 +412,72 @@ + General + + + + + Language + + + + + Application restart is needed to apply this setting. + + + + Appearance 介面 - + + Font + + + + Font Size 字體大小 - + in pixels 以圖元計算 - + Connections Tree 連接列表 - + Reopen namespaces on reload 重載時重新打開命名空間 - - + + (Disable to improve treeview performance) (禁用樹狀視圖以提高性能) - + Enable key sorting in tree 打開樹狀視圖鍵名排序功能 - + Live update maximum allowed keys 同步更新最大允許鍵數量 - + Live update interval (in seconds) 同步更新時間 (秒) - + OK 確定 @@ -506,7 +526,7 @@ RDM 不能保存設置檔。請更改檔寫入許可權或者以管理員模式啟動 RDM。 - + Please download new version of Redis Desktop Manager: %1 請下載新版本的 Redis Desktop Manager: %1 From e1b386da97a6c7da1c5d8da0488785fdea0181eb Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 4 Nov 2016 15:53:49 +0200 Subject: [PATCH 9/9] Fix unit tests --- .../testcases/connections-tree/mocks/itemoperationsmock.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h b/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h index 443579703..7d79c8d08 100644 --- a/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h +++ b/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h @@ -48,6 +48,8 @@ class ItemOperationsMock : public ConnectionsTree::Operations { virtual void flushDb(int, std::function) override {} + virtual QString mode() { return QString("fake"); } + protected: bool m_positive_mode; };