Skip to content

Commit 8acb17b

Browse files
committed
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
1 parent 1a12784 commit 8acb17b

23 files changed

+981
-892
lines changed

src/apps/openfluid-devstudio/MainWindow.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ QToolButton::menu-button:pressed, QToolButton::menu-button:hover {
277277
mp_WidgetsCollection, SLOT(closeEditor(const QString&)));
278278
connect(Explorer, SIGNAL(folderDeleted(const QString&, const QString&, const bool)),
279279
mp_WidgetsCollection, SLOT(closeEditorsInFolderFromWare(const QString&, const QString&, const bool)));
280+
connect(Explorer, SIGNAL(wareChanged(const QString&)),
281+
mp_WidgetsCollection, SLOT(onWareChange(const QString&)));
280282
}
281283

282284
connect(mp_WidgetsCollection, SIGNAL(currentTabChanged(const QString&)),

src/openfluid/ui/config.hpp.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
@file config.hpp
3434

3535
@author Jean-Christophe FABRE <jean-christophe.fabre@inra.fr>
36+
@author Armel THÖNI <armel.thoni@inrae.fr>
3637
*/
3738

3839

@@ -63,6 +64,11 @@ const char* const PLACEHOLDER_REQUIRED = QT_TRANSLATE_NOOP("openfluid::ui::confi
6364
const QString LINEMARKER_ERRCOLOR = "#FFA3A3";
6465
const QString LINEMARKER_WARNCOLOR = "#FFD6A3";
6566

67+
const QString STATUS_ERRCOLOR = "#B31717";
68+
const QString STATUS_WARNCOLOR = "#E3A740";
69+
const QString STATUS_OKCOLOR = "#55B332";
70+
const QString STATUS_DISABLEDCOLOR = "#757575";
71+
6672
const int EXIT_CODE_FOR_RESTART = -8121186;
6773

6874

src/openfluid/ui/waresdev/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ SET(OPENFLUID_UI_WARESDEV_CPP WareSrcUIContainer.cpp
2121
WorkspaceDevDashboardDialog.cpp WorkspaceDevWaresWidget.cpp WorkspaceDevGitWidget.cpp WorkspaceDevActionsWidget.cpp
2222
WorkspaceDevProcessDialog.cpp
2323
CompletionProvider.cpp
24+
WareMigrationListener.cpp
2425
MigrationSetupDialog.cpp
25-
WareDashboardStatusWidget.cpp
26-
GroupStatusMessagesWidget.cpp StatusButtonMessageWidget.cpp)
26+
WareStatusDashboardWidget.cpp
27+
WareStatusItemWidget.cpp)
2728

2829
SET(OPENFLUID_UI_WARESDEV_HPP WareSrcUIContainer.hpp
2930
WareSrcMsgStream.hpp
@@ -48,10 +49,10 @@ SET(OPENFLUID_UI_WARESDEV_HPP WareSrcUIContainer.hpp
4849
WorkspaceDevDashboardDialog.hpp WorkspaceDevWaresWidget.hpp WorkspaceDevGitWidget.hpp WorkspaceDevActionsWidget.hpp
4950
WorkspaceDevProcessDialog.hpp
5051
CompletionProvider.hpp
51-
SignalMigrationListener.hpp
52+
WareMigrationListener.hpp
5253
MigrationSetupDialog.hpp
53-
WareDashboardStatusWidget.hpp
54-
GroupStatusMessagesWidget.hpp StatusButtonMessageWidget.hpp)
54+
WareStatusDashboardWidget.hpp
55+
WareStatusItemWidget.hpp)
5556

5657
QT5_WRAP_UI(OPENFLUID_UI_WARESDEV_UI WareSrcWidget.ui WareExplorerDialog.ui WareBuildOptionsWidget.ui WareBuildOptionsDialog.ui
5758
EmptyPage.ui CppPage.ui CMakeConfigPage.ui
@@ -61,7 +62,7 @@ QT5_WRAP_UI(OPENFLUID_UI_WARESDEV_UI WareSrcWidget.ui WareExplorerDialog.ui Ware
6162
WorkspaceDevProcessDialog.ui
6263
WorkspaceDevDashboardDialog.ui WorkspaceDevWaresWidget.ui WorkspaceDevGitWidget.ui
6364
MigrationSetupDialog.ui
64-
WareDashboardStatusWidget.ui GroupStatusMessagesWidget.ui StatusButtonMessageWidget.ui)
65+
WareStatusDashboardWidget.ui WareStatusItemWidget.ui)
6566

6667

6768
#QT5_ADD_RESOURCES(OPENFLUID_UI_WARESDEV_RC resources/openfluiduiwaresdev.qrc)

src/openfluid/ui/waresdev/GroupStatusMessagesWidget.cpp

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/openfluid/ui/waresdev/GroupStatusMessagesWidget.hpp

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/openfluid/ui/waresdev/GroupStatusMessagesWidget.ui

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/openfluid/ui/waresdev/MigrationSetupDialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939

4040
#include <openfluid/ui/waresdev/MigrationSetupDialog.hpp>
41-
#include <openfluid/ui/waresdev/StatusButtonMessageWidget.hpp>
41+
#include <openfluid/ui/waresdev/WareStatusItemWidget.hpp>
4242

4343
#include "ui_MigrationSetupDialog.h"
4444

@@ -67,7 +67,7 @@ MigrationSetupDialog::~MigrationSetupDialog()
6767
// =====================================================================
6868

6969

70-
bool MigrationSetupDialog::isNewBranchChecked() // TOIMPL use this data for checkout
70+
bool MigrationSetupDialog::isNewBranchChecked()
7171
{
7272
return ui->checkoutCheckbox->isChecked();
7373
}

0 commit comments

Comments
 (0)