From daf1b6772af852fc55c75d85a48327e6ba5f373b Mon Sep 17 00:00:00 2001 From: vsv Date: Fri, 24 Jun 2005 05:41:45 +0000 Subject: [PATCH] Icons correction --- src/VISUGUI/VISU_images.po | 21 +++++ src/VISUGUI/VisuGUI.cxx | 152 ++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 76 deletions(-) diff --git a/src/VISUGUI/VISU_images.po b/src/VISUGUI/VISU_images.po index d51bc379..5f17da4b 100644 --- a/src/VISUGUI/VISU_images.po +++ b/src/VISUGUI/VISU_images.po @@ -56,3 +56,24 @@ msgstr "Visu_cutlines.png" msgid "ICON_STREAM_LINES" msgstr "Visu_streamlines.png" + +msgid "ICON_ERASE" +msgstr "Visu_eraseall.png" + +msgid "ICON_PLOT2D" +msgstr "Visu_plot2d.png" + +msgid "ICON_WIREFRAME" +msgstr "Visu_wireframe.png" + +msgid "ICON_SURFACE" +msgstr "Visu_surface.png" + +msgid "ICON_POINTS" +msgstr "Visu_points.png" + +msgid "ICON_TIMEANIMATION" +msgstr "Visu_anim.png" + +msgid "ICON_SWEEP" +msgstr "Visu_scalars_anim.png" diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index f6ff55f6..ae8fb4cb 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -1899,181 +1899,181 @@ createActions() createAction( VISU_CUT_LINES, tr("MEN_CUT_LINES"), QIconSet(aPixmap), tr("MEN_CUT_LINES"), "", 0, aParent, false, this, SLOT(OnCreateCutLines())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PLOT2D")); createAction( VISU_PLOT2D, tr("MEN_CREATE_PLOT2D"), QIconSet(aPixmap), tr("MEN_CREATE_PLOT2D"), "", 0, aParent, false, this, SLOT(OnCreatePlot2dView())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_DELETE, tr("MEN_DELETE_OBJ"), QIconSet(aPixmap), tr("MEN_DELETE_OBJ"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_DELETE, tr("MEN_DELETE_OBJ"), QIconSet(), tr("MEN_DELETE_OBJ"), "", 0, aParent, false, this, SLOT(OnDeleteObject())); //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); //createAction( 4022, tr("MEN_RENAME_TABLE"), QIconSet(aPixmap), tr("MEN_RENAME_TABLE"), "", 0, aParent, false, //this, SLOT(OnRenameTable())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_SHOW_TABLE, tr("MEN_SHOW_TABLE"), QIconSet(aPixmap), tr("MEN_SHOW_TABLE"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_SHOW_TABLE, tr("MEN_SHOW_TABLE"), QIconSet(), tr("MEN_SHOW_TABLE"), "", 0, aParent, false, this, SLOT(OnShowTable())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CREATE_CURVES, tr("MEN_CREATE_CURVES"), QIconSet(aPixmap), tr("MEN_CREATE_CURVES"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CREATE_CURVES, tr("MEN_CREATE_CURVES"), QIconSet(), tr("MEN_CREATE_CURVES"), "", 0, aParent, false, this, SLOT(OnPlotData())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_EXPORT_TABLE, tr("MEN_EXPORT_TABLE"), QIconSet(aPixmap), tr("MEN_EXPORT_TABLE"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_EXPORT_TABLE, tr("MEN_EXPORT_TABLE"), QIconSet(), tr("MEN_EXPORT_TABLE"), "", 0, aParent, false, this, SLOT(OnExportTableToFile())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CREATE_PRS, tr("MEN_CREATE_PRS"), QIconSet(aPixmap), tr("MEN_CREATE_PRS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CREATE_PRS, tr("MEN_CREATE_PRS"), QIconSet(), tr("MEN_CREATE_PRS"), "", 0, aParent, false, this, SLOT(OnCreateMesh())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CREATE_MANY_PRS, tr("MEN_CREATE_MANY_PRS"), QIconSet(aPixmap), tr("MEN_CREATE_MANY_PRS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CREATE_MANY_PRS, tr("MEN_CREATE_MANY_PRS"), QIconSet(), tr("MEN_CREATE_MANY_PRS"), "", 0, aParent, false, this, SLOT(OnCreateManyMesh())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_ERASE, tr("MEN_ERASE"), QIconSet(aPixmap), tr("MEN_ERASE"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE")); + createAction( VISU_ERASE, tr("MEN_ERASE"), QIconSet(), tr("MEN_ERASE"), "", 0, aParent, false, this, SLOT(OnErasePrs())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_DISPLAY, tr("MEN_DISPLAY"), QIconSet(aPixmap), tr("MEN_DISPLAY"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_DISPLAY, tr("MEN_DISPLAY"), QIconSet(), tr("MEN_DISPLAY"), "", 0, aParent, false, this, SLOT(OnDisplayPrs())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_DISPLAY_ONLY, tr("MEN_DISPLAY_ONLY"), QIconSet(aPixmap), tr("MEN_DISPLAY_ONLY"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_DISPLAY_ONLY, tr("MEN_DISPLAY_ONLY"), QIconSet(), tr("MEN_DISPLAY_ONLY"), "", 0, aParent, false, this, SLOT(OnDisplayOnlyPrs())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_DELETE_PRS, tr("MEN_DELETE_PRS"), QIconSet(aPixmap), tr("MEN_DELETE_PRS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_DELETE_PRS, tr("MEN_DELETE_PRS"), QIconSet(), tr("MEN_DELETE_PRS"), "", 0, aParent, false, this, SLOT(OnDeletePrs())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_COPY_PRS, tr("MEN_COPY_PRS"), QIconSet(aPixmap), tr("MEN_COPY_PRS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_COPY_PRS, tr("MEN_COPY_PRS"), QIconSet(), tr("MEN_COPY_PRS"), "", 0, aParent, false, this, SLOT(OnCopyPresentation())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CURVE_PROPS, tr("MEN_CURVE_PROPS"), QIconSet(aPixmap), tr("MEN_CURVE_PROPS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CURVE_PROPS, tr("MEN_CURVE_PROPS"), QIconSet(), tr("MEN_CURVE_PROPS"), "", 0, aParent, false, this, SLOT(OnCurveProperties())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_RENAME, tr("MEN_RENAME"), QIconSet(aPixmap), tr("MEN_RENAME"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_RENAME, tr("MEN_RENAME"), QIconSet(), tr("MEN_RENAME"), "", 0, aParent, false, this, SLOT(OnRename())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_EDIT_CONTAINER, tr("MEN_EDIT_CONTAINER"), QIconSet(aPixmap), tr("MEN_EDIT_CONTAINER"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_EDIT_CONTAINER, tr("MEN_EDIT_CONTAINER"), QIconSet(), tr("MEN_EDIT_CONTAINER"), "", 0, aParent, false, this, SLOT(OnEditContainer())); //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); //createAction( 4043, tr("MEN_RENAME_CONTAINER"), QIconSet(aPixmap), tr("MEN_RENAME_CONTAINER"), "", 0, aParent, false, //this, SLOT(OnRenameContainer())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CLEAR_CONTAINER, tr("MEN_CLEAR_CONTAINER"), QIconSet(aPixmap), tr("MEN_CLEAR_CONTAINER"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CLEAR_CONTAINER, tr("MEN_CLEAR_CONTAINER"), QIconSet(), tr("MEN_CLEAR_CONTAINER"), "", 0, aParent, false, this, SLOT(OnClearContainer())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_VIEW_PARAMS, tr("MEN_SAVE_VIEWPARAMS"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_VIEW_PARAMS, tr("MEN_SAVE_VIEWPARAMS"), QIconSet(), tr("MEN_SAVE_VIEWPARAMS"), "", 0, aParent, false, this, SLOT(OnSaveViewParams())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_RESTORE_VIEW_PARAMS, tr("MEN_RESTORE_VIEWPARAMS"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_RESTORE_VIEW_PARAMS, tr("MEN_RESTORE_VIEWPARAMS"), QIconSet(), tr("MEN_RESTORE_VIEWPARAMS"), "", 0, aParent, false, this, SLOT(OnRestoreViewParams())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_DELETE_VIEW_PARAMS, tr("MEN_DELETE_VIEWPARAMS"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_DELETE_VIEW_PARAMS, tr("MEN_DELETE_VIEWPARAMS"), QIconSet(), tr("MEN_DELETE_VIEWPARAMS"), "", 0, aParent, false, this, SLOT(OnDeleteViewParams())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_POINTS")); createAction( VISU_POINTS, tr("MEN_POINTS"), QIconSet(aPixmap), tr("MEN_POINTS"), "", 0, aParent, false, this, SLOT(OnMakePoints())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_WIREFRAME")); createAction( VISU_WIREFRAME, tr("MEN_WIREFRAME"), QIconSet(aPixmap), tr("MEN_WIREFRAME"), "", 0, aParent, false, this, SLOT(OnMakeWireframe())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SURFACE")); createAction( VISU_SURFACE, tr("MEN_SURFACE"), QIconSet(aPixmap), tr("MEN_SURFACE"), "", 0, aParent, false, this, SLOT(OnMakeSurface())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_INSIDEFRAME, tr("MEN_INSIDEFRAME"), QIconSet(aPixmap), tr("MEN_INSIDEFRAME"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_INSIDEFRAME, tr("MEN_INSIDEFRAME"), QIconSet(), tr("MEN_INSIDEFRAME"), "", 0, aParent, false, this, SLOT(OnMakeInsideframe())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_SURFACEFRAME, tr("MEN_SURFACEFRAME"), QIconSet(aPixmap), tr("MEN_SURFACEFRAME"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_SURFACEFRAME, tr("MEN_SURFACEFRAME"), QIconSet(), tr("MEN_SURFACEFRAME"), "", 0, aParent, false, this, SLOT(OnMakeSurfaceframe())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_SHRINK, tr("MEN_SHRINK"), QIconSet(aPixmap), tr("MEN_SHRINK"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_SHRINK, tr("MEN_SHRINK"), QIconSet(), tr("MEN_SHRINK"), "", 0, aParent, false, this, SLOT(OnMakeShrink())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_UNSHRINK, tr("MEN_UNSHRINK"), QIconSet(aPixmap), tr("MEN_UNSHRINK"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_UNSHRINK, tr("MEN_UNSHRINK"), QIconSet(), tr("MEN_UNSHRINK"), "", 0, aParent, false, this, SLOT(OnMakeShrink())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CELL_COLOR, tr("MEN_CELL_COLOR"), QIconSet(aPixmap), tr("MEN_CELL_COLOR"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CELL_COLOR, tr("MEN_CELL_COLOR"), QIconSet(), tr("MEN_CELL_COLOR"), "", 0, aParent, false, this, SLOT(OnChangeColor())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_COLOR, tr("MEN_COLOR"), QIconSet(aPixmap), tr("MEN_COLOR"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_COLOR, tr("MEN_COLOR"), QIconSet(), tr("MEN_COLOR"), "", 0, aParent, false, this, SLOT(OnChangeColor())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_EDGE_COLOR, tr("MEN_EDGE_COLOR"), QIconSet(aPixmap), tr("MEN_EDGE_COLOR"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_EDGE_COLOR, tr("MEN_EDGE_COLOR"), QIconSet(), tr("MEN_EDGE_COLOR"), "", 0, aParent, false, this, SLOT(OnChangeWireframeColor())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_OPACITY, tr("MEN_OPACITY"), QIconSet(aPixmap), tr("MEN_OPACITY"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_OPACITY, tr("MEN_OPACITY"), QIconSet(), tr("MEN_OPACITY"), "", 0, aParent, false, this, SLOT(OnChangeOpacity())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_LINE_WIDTH, tr("MEN_LINE_WIDTH"), QIconSet(aPixmap), tr("MEN_LINE_WIDTH"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_LINE_WIDTH, tr("MEN_LINE_WIDTH"), QIconSet(), tr("MEN_LINE_WIDTH"), "", 0, aParent, false, this, SLOT(OnChangeLines())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_EDIT_PRS, tr("MEN_EDIT_PRS"), QIconSet(aPixmap), tr("MEN_EDIT_PRS"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_EDIT_PRS, tr("MEN_EDIT_PRS"), QIconSet(), tr("MEN_EDIT_PRS"), "", 0, aParent, false, this, SLOT(OnEditPrs())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_CREATE_TABLE, tr("MEN_CREATE_TABLE"), QIconSet(aPixmap), tr("MEN_CREATE_TABLE"), "", 0, aParent, false, + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_CREATE_TABLE, tr("MEN_CREATE_TABLE"), QIconSet(), tr("MEN_CREATE_TABLE"), "", 0, aParent, false, this, SLOT(OnCreateTable())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SWEEP")); createAction( VISU_SWEEP, tr("MEN_SWEEP"), QIconSet(aPixmap), tr("MEN_SWEEP"), "", 0, aParent, false, this, SLOT(OnSweep())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_SELECTION_INFO, tr("MEN_SELECTION_INFO"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_SELECTION_INFO, tr("MEN_SELECTION_INFO"), QIconSet(), tr("MEN_SELECTION_INFO"), "", 0, aParent, false, this, SLOT(OnSelectionInfo())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_TIMEANIMATION")); createAction( VISU_ANIMATION, tr("MEN_ANIMATION"), QIconSet(aPixmap), tr("MEN_ANIMATION"), "", 0, aParent, false, this, SLOT(OnTimeAnimation())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE")); createAction( VISU_ERASE_ALL, tr("MEN_ERASE_ALL"), QIconSet(aPixmap), tr("MEN_ERASE_ALL"), "", 0, aParent, false, this, SLOT(OnEraseAll())); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(), tr("MEN_GLOBAL_SELECTION"), "", 0, aParent, false, //this, SLOT(OnEraseAll())); this); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(), tr("MEN_PARTIAL_SELECTION"), "", 0, aParent, false, //this, SLOT(OnEraseAll())); this); - aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); - createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(aPixmap), + //aPixmap = aResourceMgr->loadPixmap("VISU",tr("")); + createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(), tr("MEN_SCALING"), "", 0, aParent, false, this, SLOT(OnScaling())); } @@ -2290,9 +2290,9 @@ createPopupMenus() mgr->setRule( action( VISU_SWEEP ), aRule, true ); // Selection info popup item - aRule = "client='ObjectBrowser' and selcount=1" + aInsideType; - mgr->insert( action( VISU_SELECTION_INFO ), -1, -1, -1 ); // Selection info - mgr->setRule( action( VISU_SELECTION_INFO ), aRule, true ); + // aRule = "client='ObjectBrowser' and selcount=1" + aInsideType; + // mgr->insert( action( VISU_SELECTION_INFO ), -1, -1, -1 ); // Selection info + // mgr->setRule( action( VISU_SELECTION_INFO ), aRule, true ); aRule = "client='ObjectBrowser' and selcount>0 and $type in {'VISU::TFIELD'} and nbTimeStamps>1"; mgr->insert( action( VISU_ANIMATION ), -1, -1, -1 ); // animation -- 2.39.2