Devstudio improvements for ware board and migration

* improved stylecheck compliance for ware board and migration * added functional board refresh after file/folder delete from ware explorer * unified strings for ware migration * changed interace structure for board
OpenFLUID · May 11, 2023 · 8acb17b · 8acb17b
1 parent 1a12784
commit 8acb17b
Show file tree

Hide file tree

Showing 23 changed files with 981 additions and 892 deletions.
diff --git a/src/apps/openfluid-devstudio/MainWindow.cpp b/src/apps/openfluid-devstudio/MainWindow.cpp
@@ -277,6 +277,8 @@ QToolButton::menu-button:pressed, QToolButton::menu-button:hover {
             mp_WidgetsCollection, SLOT(closeEditor(const QString&)));
     connect(Explorer, SIGNAL(folderDeleted(const QString&, const QString&, const bool)),
             mp_WidgetsCollection, SLOT(closeEditorsInFolderFromWare(const QString&, const QString&, const bool)));
+    connect(Explorer, SIGNAL(wareChanged(const QString&)),
+            mp_WidgetsCollection, SLOT(onWareChange(const QString&)));
   }
 
   connect(mp_WidgetsCollection, SIGNAL(currentTabChanged(const QString&)),

diff --git a/src/openfluid/ui/config.hpp.in b/src/openfluid/ui/config.hpp.in
@@ -33,6 +33,7 @@
   @file config.hpp
 
   @author Jean-Christophe FABRE <jean-christophe.fabre@inra.fr>
+  @author Armel THÖNI <armel.thoni@inrae.fr>
 */
 
 
@@ -63,6 +64,11 @@ const char* const PLACEHOLDER_REQUIRED = QT_TRANSLATE_NOOP("openfluid::ui::confi
 const QString LINEMARKER_ERRCOLOR = "#FFA3A3";
 const QString LINEMARKER_WARNCOLOR = "#FFD6A3";
 
+const QString STATUS_ERRCOLOR = "#B31717";
+const QString STATUS_WARNCOLOR = "#E3A740";
+const QString STATUS_OKCOLOR = "#55B332";
+const QString STATUS_DISABLEDCOLOR = "#757575";
+
 const int EXIT_CODE_FOR_RESTART = -8121186;
 
 

diff --git a/src/openfluid/ui/waresdev/CMakeLists.txt b/src/openfluid/ui/waresdev/CMakeLists.txt
@@ -21,9 +21,10 @@ SET(OPENFLUID_UI_WARESDEV_CPP WareSrcUIContainer.cpp
                               WorkspaceDevDashboardDialog.cpp WorkspaceDevWaresWidget.cpp WorkspaceDevGitWidget.cpp WorkspaceDevActionsWidget.cpp
                               WorkspaceDevProcessDialog.cpp
                               CompletionProvider.cpp
+                              WareMigrationListener.cpp
                               MigrationSetupDialog.cpp
-                              WareDashboardStatusWidget.cpp
-                              GroupStatusMessagesWidget.cpp StatusButtonMessageWidget.cpp)
+                              WareStatusDashboardWidget.cpp
+                              WareStatusItemWidget.cpp)
 
 SET(OPENFLUID_UI_WARESDEV_HPP WareSrcUIContainer.hpp
                               WareSrcMsgStream.hpp 
@@ -48,10 +49,10 @@ SET(OPENFLUID_UI_WARESDEV_HPP WareSrcUIContainer.hpp
                               WorkspaceDevDashboardDialog.hpp WorkspaceDevWaresWidget.hpp WorkspaceDevGitWidget.hpp WorkspaceDevActionsWidget.hpp
                               WorkspaceDevProcessDialog.hpp
                               CompletionProvider.hpp
-                              SignalMigrationListener.hpp
+                              WareMigrationListener.hpp
                               MigrationSetupDialog.hpp
-                              WareDashboardStatusWidget.hpp
-                              GroupStatusMessagesWidget.hpp StatusButtonMessageWidget.hpp)
+                              WareStatusDashboardWidget.hpp
+                              WareStatusItemWidget.hpp)
 
 QT5_WRAP_UI(OPENFLUID_UI_WARESDEV_UI WareSrcWidget.ui WareExplorerDialog.ui WareBuildOptionsWidget.ui WareBuildOptionsDialog.ui
                                      EmptyPage.ui CppPage.ui CMakeConfigPage.ui
@@ -61,7 +62,7 @@ QT5_WRAP_UI(OPENFLUID_UI_WARESDEV_UI WareSrcWidget.ui WareExplorerDialog.ui Ware
                                      WorkspaceDevProcessDialog.ui
                                      WorkspaceDevDashboardDialog.ui WorkspaceDevWaresWidget.ui WorkspaceDevGitWidget.ui
                                      MigrationSetupDialog.ui
-                                     WareDashboardStatusWidget.ui GroupStatusMessagesWidget.ui StatusButtonMessageWidget.ui)
+                                     WareStatusDashboardWidget.ui WareStatusItemWidget.ui)
 
 
 #QT5_ADD_RESOURCES(OPENFLUID_UI_WARESDEV_RC resources/openfluiduiwaresdev.qrc)

diff --git a/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.cpp b/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.cpp
diff --git a/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.hpp b/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.hpp
diff --git a/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.ui b/src/openfluid/ui/waresdev/GroupStatusMessagesWidget.ui
diff --git a/src/openfluid/ui/waresdev/MigrationSetupDialog.cpp b/src/openfluid/ui/waresdev/MigrationSetupDialog.cpp
@@ -38,7 +38,7 @@
 
 
 #include <openfluid/ui/waresdev/MigrationSetupDialog.hpp>
-#include <openfluid/ui/waresdev/StatusButtonMessageWidget.hpp>
+#include <openfluid/ui/waresdev/WareStatusItemWidget.hpp>
 
 #include "ui_MigrationSetupDialog.h"
 
@@ -67,7 +67,7 @@ MigrationSetupDialog::~MigrationSetupDialog()
 // =====================================================================
 
 
-bool MigrationSetupDialog::isNewBranchChecked() // TOIMPL use this data for checkout
+bool MigrationSetupDialog::isNewBranchChecked()
 {
   return ui->checkoutCheckbox->isChecked();
 }