// PARAVIS : ParaView wrapper SALOME module
//
-// Copyright (C) 2010-2016 CEA/DEN, EDF R&D
+// Copyright (C) 2010-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <pqExportReaction.h>
#include <pqSaveAnimationReaction.h>
#include <pqSaveAnimationGeometryReaction.h>
+#include <pqLoadMaterialsReaction.h>
#include <pqServerConnectReaction.h>
#include <pqServerDisconnectReaction.h>
#include <pqCameraUndoRedoReaction.h>
#include <pqAboutDialogReaction.h>
#include <pqHelpReaction.h>
#include <pqDataQueryReaction.h>
-#include <pqPythonShellReaction.h>
+//#include <pqPythonShellReaction.h>
#include <pqViewManager.h>
#include <pqViewMenuManager.h>
registerAction(SaveGeometryId, anAction);
new pqSaveAnimationGeometryReaction(anAction);
+ // Load Path Tracer Materials
+ aPixmap = resMgr->loadPixmap( "ParaView", tr("ICON_LOAD_MATERIAL"), false );
+ anAction = new QAction(QIcon(aPixmap), tr("MEN_LOAD_MATERIAL"), this);
+ anAction->setToolTip(tr("TOP_LOAD_MATERIAL"));
+ anAction->setStatusTip(tr("STB_LOAD_MATERIAL"));
+ registerAction(LoadMaterialsId, anAction);
+ new pqLoadMaterialsReaction(anAction);
+
// Connect
aPixmap = resMgr->loadPixmap( "ParaView", tr("ICON_CONNECT"), false );
anAction = new QAction(QIcon(aPixmap), tr("MEN_CONNECT"), this);
anAction->setToolTip(tr("TOP_DELETE_ALL"));
anAction->setStatusTip(tr("STB_DELETE_ALL"));
registerAction(DeleteAllId, anAction);
- new pqDeleteReaction(anAction, true);
+ new pqDeleteReaction(anAction, pqDeleteReaction::DeleteModes::ALL);
// Setting
registerAction(TimerLogId, anAction);
new pqTimerLogReaction(anAction << pqSetName("actionToolsTimerLog"));
- // Output Window
- anAction = new QAction(tr("MEN_OUTPUT_WINDOW"), this);
- anAction->setToolTip(tr("TOP_OUTPUT_WINDOW"));
- anAction->setStatusTip(tr("STB_OUTPUT_WINDOW"));
- registerAction(OutputWindowId, anAction);
- anAction << pqSetName("actionToolsOutputWindow");
- connect(anAction, SIGNAL(triggered()), pqApplicationCore::instance(), SLOT(showOutputWindow()));
-
- // Python Shell
+ // Python Shell
+ // ???
+ // No more pqPythonShellReaction class, but there is a pqPythonShell class.
+ // Is that equivalent? I don't know what to do at this stage.
anAction = new QAction(tr("MEN_PYTHON_SHELL"), this);
anAction->setToolTip(tr("TOP_PYTHON_SHELL"));
anAction->setStatusTip(tr("STB_PYTHON_SHELL"));
registerAction(PythonShellId, anAction);
+ /*
new pqPythonShellReaction(anAction << pqSetName("actionToolsPythonShell"));
+ */
//Show Trace
anAction = new QAction(tr("MEN_SHOW_TRACE"), this);
// Recent Files
myRecentMenuId = createMenu( tr( "MEN_RECENT_FILES" ), aPVMnu, -1, 5 );
QMenu* aMenu = menuMgr()->findMenu( myRecentMenuId );
- pqRecentFilesMenu* aRecentFilesMenu = new pqRecentFilesMenu( *aMenu, getApp()->desktop() );
+ /*pqRecentFilesMenu* aRecentFilesMenu = */new pqRecentFilesMenu( *aMenu, getApp()->desktop() );
QList<QAction*> anActns = aMenu->actions();
for (int i = 0; i < anActns.size(); ++i)
createMenu( anActns.at(i), myRecentMenuId );
createMenu( SaveGeometryId, aPVMnu, 35 );
createMenu( separator(), aPVMnu, -1, 35 );
- createMenu( ConnectId, aPVMnu, 45 );
- createMenu( DisconnectId, aPVMnu, 45 );
+ createMenu( LoadMaterialsId, aPVMnu, 45);
createMenu( separator(), aPVMnu, -1, 45 );
+ createMenu( ConnectId, aPVMnu, 55 );
+ createMenu( DisconnectId, aPVMnu, 55 );
+ createMenu( separator(), aPVMnu, -1, 55 );
+
// --- Menu "Edit"
aPVMnu = createMenu( tr( "MEN_DESK_EDIT" ), -1, -1 );
createMenu( separator(), aToolsMnu );
createMenu( TimerLogId, aToolsMnu );
- createMenu( OutputWindowId, aToolsMnu );
createMenu( separator(), aToolsMnu );
createMenu( PythonShellId, aToolsMnu );
// -- Context menu in the pipeline browser
pqPipelineBrowserWidget * pq = guiElements->getPipelineBrowserWidget();
- pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( *pq );
+ pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( *(pq->contextMenu()) );
}
/*!