1.26.2 release

fastogt · Feb 2, 2019 · 5f68ed1 · 5f68ed1
1 parent 7a92db1
commit 5f68ed1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
-1.26.2 /
+1.26.2 / February 2, 2019
 [Alexandr Topilski]
+- [Redis] Fixed discovery cluster
 
 1.26.1 / January 13, 2019
 [Alexandr Topilski]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.6.3) # OPENSSL_USE_STATIC_LIBS
 
 SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default
 SET(BRANDING_PROJECT_VERSION "1.26.2.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default
-SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "alfa" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default
+SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "release" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default
   #possible variables: alfa, beta, rc, release
 
 SET(BRANDING_PROJECT_DOMAIN "https://fastonosql.com" CACHE STRING "Branding domain url for ${BRANDING_PROJECT_NAME}") #default

diff --git a/FASTOREDIS_CHANGELOG b/FASTOREDIS_CHANGELOG
@@ -1,5 +1,6 @@
-1.23.4 /
+1.23.4 / February 2, 2019
 [Alexandr Topilski]
+- Fixed discovery cluster
 
 1.23.3 / January 13, 2019
 [Alexandr Topilski]

diff --git a/src/gui/dialogs/discovery_cluster_dialog.cpp b/src/gui/dialogs/discovery_cluster_dialog.cpp
@@ -38,7 +38,7 @@
 
 namespace {
 const QSize kStateIconSize = QSize(64, 64);
-const QString trTooltip = QObject::tr("Select items which you want add to cluster.");
+const QString trNoteCluster = QObject::tr("Select items which you want add to cluster.");
 }  // namespace
 
 namespace fastonosql {
@@ -63,6 +63,9 @@ DiscoveryClusterDiagnosticDialog::DiscoveryClusterDiagnosticDialog(const QString
 
   status_label_ = new QLabel(translations::trTimeTemplate_1S.arg("calculate..."));
   icon_label_ = new QLabel;
+  note_label_ = new QLabel(trNoteCluster);
+  note_label_->setStyleSheet("QLabel { color: red; }");
+  note_label_->setVisible(false);
   setIcon(GuiFactory::GetInstance().failIcon());
 
   list_widget_ = new QTreeWidget;
@@ -75,7 +78,7 @@ DiscoveryClusterDiagnosticDialog::DiscoveryClusterDiagnosticDialog(const QString
   list_widget_->setSelectionMode(QAbstractItemView::MultiSelection);
   list_widget_->setSelectionBehavior(QAbstractItemView::SelectRows);
   list_widget_->setEnabled(false);
-  list_widget_->setToolTip(trTooltip);
+  list_widget_->setToolTip(trNoteCluster);
 
   QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Ok);
   button_box->setOrientation(Qt::Horizontal);
@@ -85,6 +88,7 @@ DiscoveryClusterDiagnosticDialog::DiscoveryClusterDiagnosticDialog(const QString
   main_layout->addWidget(execute_time_label_);
   main_layout->addWidget(status_label_);
   main_layout->addWidget(icon_label_, 1, Qt::AlignCenter);
+  main_layout->addWidget(note_label_);
   main_layout->addWidget(list_widget_);
   main_layout->addWidget(button_box);
   setLayout(main_layout);
@@ -123,6 +127,7 @@ void DiscoveryClusterDiagnosticDialog::connectionResultReady(common::Error err,
     common::ConvertFromString(err->GetDescription(), &qerror);
     setIcon(GuiFactory::GetInstance().failIcon());
     status_label_->setText(translations::trConnectionStatusTemplate_1S.arg(qerror));
+    note_label_->setVisible(false);
     return;
   }
 
@@ -139,6 +144,7 @@ void DiscoveryClusterDiagnosticDialog::connectionResultReady(common::Error err,
     list_widget_->addTopLevelItem(item);
   }
   status_label_->setText(translations::trConnectionStatusTemplate_1S.arg(translations::trSuccess));
+  note_label_->setVisible(true);
 }
 
 void DiscoveryClusterDiagnosticDialog::showEvent(QShowEvent* e) {

diff --git a/src/gui/dialogs/discovery_cluster_dialog.h b/src/gui/dialogs/discovery_cluster_dialog.h
@@ -75,6 +75,7 @@ class DiscoveryClusterDiagnosticDialog : public BaseDialog {
   common::qt::gui::GlassWidget* glass_widget_;
   QLabel* execute_time_label_;
   QLabel* status_label_;
+  QLabel* note_label_;
   QTreeWidget* list_widget_;
   QLabel* icon_label_;
   proxy::IClusterSettingsBaseSPtr cluster_;

diff --git a/src/gui/dialogs/discovery_sentinel_dialog.cpp b/src/gui/dialogs/discovery_sentinel_dialog.cpp
@@ -40,7 +40,8 @@
 
 namespace {
 const QSize kStateIconSize = QSize(64, 64);
-}
+const QString trNoteSentinel = QObject::tr("Select items which you want add to sentinel.");
+}  // namespace
 
 namespace fastonosql {
 namespace gui {
@@ -62,6 +63,9 @@ DiscoverySentinelDiagnosticDialog::DiscoverySentinelDiagnosticDialog(const QStri
 
   status_label_ = new QLabel(translations::trTimeTemplate_1S.arg("calculate..."));
   icon_label_ = new QLabel;
+  note_label_ = new QLabel(trNoteSentinel);
+  note_label_->setStyleSheet("QLabel { color: red; }");
+  note_label_->setVisible(false);
   setIcon(GuiFactory::GetInstance().failIcon());
 
   list_widget_ = new QTreeWidget;
@@ -78,7 +82,7 @@ DiscoverySentinelDiagnosticDialog::DiscoverySentinelDiagnosticDialog(const QStri
   list_widget_->setSelectionBehavior(QAbstractItemView::SelectRows);
 
   list_widget_->setEnabled(false);
-  list_widget_->setToolTip(tr("Select items which you want add to sentinel."));
+  list_widget_->setToolTip(trNoteSentinel);
 
   QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Ok);
   button_box->setOrientation(Qt::Horizontal);
@@ -88,6 +92,7 @@ DiscoverySentinelDiagnosticDialog::DiscoverySentinelDiagnosticDialog(const QStri
   main_layout->addWidget(execute_time_label_);
   main_layout->addWidget(status_label_);
   main_layout->addWidget(icon_label_, 1, Qt::AlignCenter);
+  main_layout->addWidget(note_label_);
   main_layout->addWidget(list_widget_);
   main_layout->addWidget(button_box);
   setLayout(main_layout);
@@ -127,6 +132,7 @@ void DiscoverySentinelDiagnosticDialog::connectionResultReady(
     common::ConvertFromString(err->GetDescription(), &qerror);
     setIcon(GuiFactory::GetInstance().failIcon());
     status_label_->setText(translations::trConnectionStatusTemplate_1S.arg(qerror));
+    note_label_->setVisible(false);
     return;
   }
 
@@ -142,6 +148,7 @@ void DiscoverySentinelDiagnosticDialog::connectionResultReady(
     list_widget_->addTopLevelItem(item);
   }
   status_label_->setText(translations::trConnectionStatusTemplate_1S.arg(translations::trSuccess));
+  note_label_->setVisible(true);
 }
 
 void DiscoverySentinelDiagnosticDialog::showEvent(QShowEvent* e) {

diff --git a/src/gui/dialogs/discovery_sentinel_dialog.h b/src/gui/dialogs/discovery_sentinel_dialog.h
@@ -72,6 +72,7 @@ class DiscoverySentinelDiagnosticDialog : public BaseDialog {
   common::qt::gui::GlassWidget* glass_widget_;
   QLabel* execute_time_label_;
   QLabel* status_label_;
+  QLabel* note_label_;
   QTreeWidget* list_widget_;
   QLabel* icon_label_;
 };