From e5d06a29a27df3b8ef942b3e211ed2d348159ce6 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 15 Feb 2020 11:14:12 -0800 Subject: [PATCH] Renamed pipette to color picker and fixed indentation. --- common/lc_commands.cpp | 16 +- common/lc_commands.h | 4 +- common/lc_glwidget.h | 2 +- common/lc_mainwindow.cpp | 18 +- common/lc_model.cpp | 10 +- common/lc_model.h | 2 +- common/view.cpp | 168 +++++++++--------- common/view.h | 2 +- leocad.qrc | 6 +- qt/lc_qglwidget.cpp | 2 +- ...on_pipette.png => action_color_picker.png} | Bin ...ette_16.png => action_color_picker_16.png} | Bin ...or_pipette.png => cursor_color_picker.png} | Bin 13 files changed, 115 insertions(+), 115 deletions(-) rename resources/{action_pipette.png => action_color_picker.png} (100%) rename resources/{action_pipette_16.png => action_color_picker_16.png} (100%) rename resources/{cursor_pipette.png => cursor_color_picker.png} (100%) diff --git a/common/lc_commands.cpp b/common/lc_commands.cpp index b441e7c3..be1906ab 100644 --- a/common/lc_commands.cpp +++ b/common/lc_commands.cpp @@ -619,13 +619,13 @@ lcCommand gCommands[LC_NUM_COMMANDS] = QT_TRANSLATE_NOOP("Status", "Change piece color"), "" }, - // LC_EDIT_ACTION_PIPETTE - { - QT_TRANSLATE_NOOP("Action", "Edit.Tool.Pipette"), - QT_TRANSLATE_NOOP("Menu", "Pipette"), - QT_TRANSLATE_NOOP("Status", "Get piece color"), - "" - }, + // LC_EDIT_ACTION_COLOR_PICKER + { + QT_TRANSLATE_NOOP("Action", "Edit.Tool.ColorPicker"), + QT_TRANSLATE_NOOP("Menu", "Color Picker"), + QT_TRANSLATE_NOOP("Status", "Get piece color"), + "" + }, // LC_EDIT_ACTION_ZOOM { QT_TRANSLATE_NOOP("Action", "Edit.Tool.Zoom"), @@ -1586,7 +1586,7 @@ const char* gToolNames[LC_NUM_TOOLS] = QT_TRANSLATE_NOOP("Mouse", "Rotate"), // LC_TOOL_ROTATE QT_TRANSLATE_NOOP("Mouse", "Delete"), // LC_TOOL_ERASER QT_TRANSLATE_NOOP("Mouse", "Paint"), // LC_TOOL_PAINT - QT_TRANSLATE_NOOP("Mouse", "Pipette"), // LC_TOOL_PIPETTE + QT_TRANSLATE_NOOP("Mouse", "ColorPicker"), // LC_TOOL_COLOR_PICKER QT_TRANSLATE_NOOP("Mouse", "Zoom"), // LC_TOOL_ZOOM QT_TRANSLATE_NOOP("Mouse", "Pan"), // LC_TOOL_PAN QT_TRANSLATE_NOOP("Mouse", "Orbit"), // LC_TOOL_ROTATE_VIEW diff --git a/common/lc_commands.h b/common/lc_commands.h index 0625dd17..57e22141 100644 --- a/common/lc_commands.h +++ b/common/lc_commands.h @@ -95,7 +95,7 @@ enum lcCommandId LC_EDIT_ACTION_ROTATE, LC_EDIT_ACTION_DELETE, LC_EDIT_ACTION_PAINT, - LC_EDIT_ACTION_PIPETTE, + LC_EDIT_ACTION_COLOR_PICKER, LC_EDIT_ACTION_ZOOM, LC_EDIT_ACTION_PAN, LC_EDIT_ACTION_ROTATE_VIEW, @@ -264,7 +264,7 @@ enum lcTool LC_TOOL_ROTATE, LC_TOOL_ERASER, LC_TOOL_PAINT, - LC_TOOL_PIPETTE, + LC_TOOL_COLOR_PICKER, LC_TOOL_ZOOM, LC_TOOL_PAN, LC_TOOL_ROTATE_VIEW, diff --git a/common/lc_glwidget.h b/common/lc_glwidget.h index f566385d..4cdd9316 100644 --- a/common/lc_glwidget.h +++ b/common/lc_glwidget.h @@ -18,7 +18,7 @@ enum LC_CURSOR_TYPE LC_CURSOR_ROTATEY, LC_CURSOR_DELETE, LC_CURSOR_PAINT, - LC_CURSOR_PIPETTE, + LC_CURSOR_COLOR_PICKER, LC_CURSOR_ZOOM, LC_CURSOR_ZOOM_REGION, LC_CURSOR_PAN, diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index 90241087..e412886e 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -286,10 +286,10 @@ void lcMainWindow::CreateActions() EditActionPaintIcon.addFile(":/resources/action_paint_16.png"); mActions[LC_EDIT_ACTION_PAINT]->setIcon(EditActionPaintIcon); - QIcon EditActionPipetteIcon; - EditActionPipetteIcon.addFile(":/resources/action_pipette.png"); - EditActionPipetteIcon.addFile(":/resources/action_pipette_16.png"); - mActions[LC_EDIT_ACTION_PIPETTE]->setIcon(EditActionPipetteIcon); + QIcon EditActionColorPickerIcon; + EditActionColorPickerIcon.addFile(":/resources/action_color_picker.png"); + EditActionColorPickerIcon.addFile(":/resources/action_color_picker_16.png"); + mActions[LC_EDIT_ACTION_COLOR_PICKER]->setIcon(EditActionColorPickerIcon); QIcon EditActionZoomIcon; EditActionZoomIcon.addFile(":/resources/action_zoom.png"); @@ -448,7 +448,7 @@ void lcMainWindow::CreateMenus() mToolsMenu->addAction(mActions[LC_EDIT_ACTION_ROTATE]); mToolsMenu->addAction(mActions[LC_EDIT_ACTION_DELETE]); mToolsMenu->addAction(mActions[LC_EDIT_ACTION_PAINT]); - mToolsMenu->addAction(mActions[LC_EDIT_ACTION_PIPETTE]); + mToolsMenu->addAction(mActions[LC_EDIT_ACTION_COLOR_PICKER]); mToolsMenu->addSeparator(); mToolsMenu->addAction(mActions[LC_EDIT_ACTION_ZOOM]); mToolsMenu->addAction(mActions[LC_EDIT_ACTION_PAN]); @@ -671,7 +671,7 @@ void lcMainWindow::CreateToolBars() mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_ROTATE]); mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_DELETE]); mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_PAINT]); - mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_PIPETTE]); + mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_COLOR_PICKER]); mToolsToolBar->addSeparator(); mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_ZOOM]); mToolsToolBar->addAction(mActions[LC_EDIT_ACTION_PAN]); @@ -3159,9 +3159,9 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId) SetTool(LC_TOOL_PAINT); break; - case LC_EDIT_ACTION_PIPETTE: - SetTool(LC_TOOL_PIPETTE); - break; + case LC_EDIT_ACTION_COLOR_PICKER: + SetTool(LC_TOOL_COLOR_PICKER); + break; case LC_EDIT_ACTION_ZOOM: SetTool(LC_TOOL_ZOOM); diff --git a/common/lc_model.cpp b/common/lc_model.cpp index c0d1bdfc..0794fef7 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -4202,14 +4202,14 @@ void lcModel::PaintToolClicked(lcObject* Object) } } -void lcModel::PipetteToolClicked(lcObject* Object) +void lcModel::ColorPickerToolClicked(lcObject* Object) { - if(!Object || Object->GetType() != LC_OBJECT_PIECE) - return; + if (!Object || Object->GetType() != LC_OBJECT_PIECE) + return; - lcPiece* Piece = (lcPiece*)Object; + lcPiece* Piece = (lcPiece*)Object; - gMainWindow->SetColorIndex(Piece->mColorIndex); + gMainWindow->SetColorIndex(Piece->mColorIndex); } void lcModel::UpdateZoomTool(lcCamera* Camera, float Mouse) diff --git a/common/lc_model.h b/common/lc_model.h index 17688833..17a0e72d 100644 --- a/common/lc_model.h +++ b/common/lc_model.h @@ -303,7 +303,7 @@ public: void UpdateScaleTool(const float Scale); void EraserToolClicked(lcObject* Object); void PaintToolClicked(lcObject* Object); - void PipetteToolClicked(lcObject* Object); + void ColorPickerToolClicked(lcObject* Object); void UpdateZoomTool(lcCamera* Camera, float Mouse); void UpdatePanTool(lcCamera* Camera, const lcVector3& Distance); void UpdateOrbitTool(lcCamera* Camera, float MouseX, float MouseY); diff --git a/common/view.cpp b/common/view.cpp index aff2f496..11088160 100644 --- a/common/view.cpp +++ b/common/view.cpp @@ -457,36 +457,36 @@ LC_CURSOR_TYPE View::GetCursor() const const LC_CURSOR_TYPE CursorFromTrackTool[] = { - LC_CURSOR_SELECT, // LC_TRACKTOOL_NONE - LC_CURSOR_BRICK, // LC_TRACKTOOL_INSERT - LC_CURSOR_LIGHT, // LC_TRACKTOOL_POINTLIGHT - LC_CURSOR_SPOTLIGHT, // LC_TRACKTOOL_SPOTLIGHT - LC_CURSOR_CAMERA, // LC_TRACKTOOL_CAMERA - LC_CURSOR_SELECT, // LC_TRACKTOOL_SELECT - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_X - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_Y - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_Z - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XY - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XZ - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_YZ - LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XYZ - LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_X - LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_Y - LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_Z - LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_XY - LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_XYZ - LC_CURSOR_MOVE, // LC_TRACKTOOL_SCALE_PLUS - LC_CURSOR_MOVE, // LC_TRACKTOOL_SCALE_MINUS - LC_CURSOR_DELETE, // LC_TRACKTOOL_ERASER - LC_CURSOR_PAINT, // LC_TRACKTOOL_PAINT - LC_CURSOR_PIPETTE, // LC_TRACKTOOL_PIPETTE - LC_CURSOR_ZOOM, // LC_TRACKTOOL_ZOOM - LC_CURSOR_PAN, // LC_TRACKTOOL_PAN - LC_CURSOR_ROTATEX, // LC_TRACKTOOL_ORBIT_X - LC_CURSOR_ROTATEY, // LC_TRACKTOOL_ORBIT_Y - LC_CURSOR_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_XY - LC_CURSOR_ROLL, // LC_TRACKTOOL_ROLL - LC_CURSOR_ZOOM_REGION // LC_TRACKTOOL_ZOOM_REGION + LC_CURSOR_SELECT, // LC_TRACKTOOL_NONE + LC_CURSOR_BRICK, // LC_TRACKTOOL_INSERT + LC_CURSOR_LIGHT, // LC_TRACKTOOL_POINTLIGHT + LC_CURSOR_SPOTLIGHT, // LC_TRACKTOOL_SPOTLIGHT + LC_CURSOR_CAMERA, // LC_TRACKTOOL_CAMERA + LC_CURSOR_SELECT, // LC_TRACKTOOL_SELECT + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_X + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_Y + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_Z + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XY + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XZ + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_YZ + LC_CURSOR_MOVE, // LC_TRACKTOOL_MOVE_XYZ + LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_X + LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_Y + LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_Z + LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_XY + LC_CURSOR_ROTATE, // LC_TRACKTOOL_ROTATE_XYZ + LC_CURSOR_MOVE, // LC_TRACKTOOL_SCALE_PLUS + LC_CURSOR_MOVE, // LC_TRACKTOOL_SCALE_MINUS + LC_CURSOR_DELETE, // LC_TRACKTOOL_ERASER + LC_CURSOR_PAINT, // LC_TRACKTOOL_PAINT + LC_CURSOR_COLOR_PICKER, // LC_TRACKTOOL_COLOR_PICKER + LC_CURSOR_ZOOM, // LC_TRACKTOOL_ZOOM + LC_CURSOR_PAN, // LC_TRACKTOOL_PAN + LC_CURSOR_ROTATEX, // LC_TRACKTOOL_ORBIT_X + LC_CURSOR_ROTATEY, // LC_TRACKTOOL_ORBIT_Y + LC_CURSOR_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_XY + LC_CURSOR_ROLL, // LC_TRACKTOOL_ROLL + LC_CURSOR_ZOOM_REGION // LC_TRACKTOOL_ZOOM_REGION }; return CursorFromTrackTool[mTrackTool]; @@ -1879,36 +1879,36 @@ lcTool View::GetCurrentTool() const { const lcTool ToolFromTrackTool[] = { - LC_TOOL_SELECT, // LC_TRACKTOOL_NONE - LC_TOOL_INSERT, // LC_TRACKTOOL_INSERT - LC_TOOL_LIGHT, // LC_TRACKTOOL_POINTLIGHT - LC_TOOL_SPOTLIGHT, // LC_TRACKTOOL_SPOTLIGHT - LC_TOOL_CAMERA, // LC_TRACKTOOL_CAMERA - LC_TOOL_SELECT, // LC_TRACKTOOL_SELECT - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_X - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_Y - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_Z - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XY - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XZ - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_YZ - LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XYZ - LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_X - LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_Y - LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_Z - LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_XY - LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_XYZ - LC_TOOL_MOVE, // LC_TRACKTOOL_SCALE_PLUS - LC_TOOL_MOVE, // LC_TRACKTOOL_SCALE_MINUS - LC_TOOL_ERASER, // LC_TRACKTOOL_ERASER - LC_TOOL_PAINT, // LC_TRACKTOOL_PAINT - LC_TOOL_PIPETTE, // LC_TRACKTOOL_PIPETTE - LC_TOOL_ZOOM, // LC_TRACKTOOL_ZOOM - LC_TOOL_PAN, // LC_TRACKTOOL_PAN - LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_X - LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_Y - LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_XY - LC_TOOL_ROLL, // LC_TRACKTOOL_ROLL - LC_TOOL_ZOOM_REGION // LC_TRACKTOOL_ZOOM_REGION + LC_TOOL_SELECT, // LC_TRACKTOOL_NONE + LC_TOOL_INSERT, // LC_TRACKTOOL_INSERT + LC_TOOL_LIGHT, // LC_TRACKTOOL_POINTLIGHT + LC_TOOL_SPOTLIGHT, // LC_TRACKTOOL_SPOTLIGHT + LC_TOOL_CAMERA, // LC_TRACKTOOL_CAMERA + LC_TOOL_SELECT, // LC_TRACKTOOL_SELECT + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_X + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_Y + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_Z + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XY + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XZ + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_YZ + LC_TOOL_MOVE, // LC_TRACKTOOL_MOVE_XYZ + LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_X + LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_Y + LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_Z + LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_XY + LC_TOOL_ROTATE, // LC_TRACKTOOL_ROTATE_XYZ + LC_TOOL_MOVE, // LC_TRACKTOOL_SCALE_PLUS + LC_TOOL_MOVE, // LC_TRACKTOOL_SCALE_MINUS + LC_TOOL_ERASER, // LC_TRACKTOOL_ERASER + LC_TOOL_PAINT, // LC_TRACKTOOL_PAINT + LC_TOOL_COLOR_PICKER, // LC_TRACKTOOL_COLOR_PICKER + LC_TOOL_ZOOM, // LC_TRACKTOOL_ZOOM + LC_TOOL_PAN, // LC_TRACKTOOL_PAN + LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_X + LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_Y + LC_TOOL_ROTATE_VIEW, // LC_TRACKTOOL_ORBIT_XY + LC_TOOL_ROLL, // LC_TRACKTOOL_ROLL + LC_TOOL_ZOOM_REGION // LC_TRACKTOOL_ZOOM_REGION }; return ToolFromTrackTool[mTrackTool]; @@ -1926,21 +1926,21 @@ lcTrackTool View::GetOverrideTrackTool(Qt::MouseButton Button) const lcTrackTool TrackToolFromTool[LC_NUM_TOOLS] = { - LC_TRACKTOOL_INSERT, // LC_TOOL_INSERT - LC_TRACKTOOL_POINTLIGHT, // LC_TOOL_LIGHT - LC_TRACKTOOL_SPOTLIGHT, // LC_TOOL_SPOTLIGHT - LC_TRACKTOOL_CAMERA, // LC_TOOL_CAMERA - LC_TRACKTOOL_SELECT, // LC_TOOL_SELECT - LC_TRACKTOOL_MOVE_XYZ, // LC_TOOL_MOVE - LC_TRACKTOOL_ROTATE_XYZ, // LC_TOOL_ROTATE - LC_TRACKTOOL_ERASER, // LC_TOOL_ERASER - LC_TRACKTOOL_PAINT, // LC_TOOL_PAINT - LC_TRACKTOOL_PIPETTE, // LC_TOOL_PIPETTE - LC_TRACKTOOL_ZOOM, // LC_TOOL_ZOOM - LC_TRACKTOOL_PAN, // LC_TOOL_PAN - LC_TRACKTOOL_ORBIT_XY, // LC_TOOL_ROTATE_VIEW - LC_TRACKTOOL_ROLL, // LC_TOOL_ROLL - LC_TRACKTOOL_ZOOM_REGION // LC_TOOL_ZOOM_REGION + LC_TRACKTOOL_INSERT, // LC_TOOL_INSERT + LC_TRACKTOOL_POINTLIGHT, // LC_TOOL_LIGHT + LC_TRACKTOOL_SPOTLIGHT, // LC_TOOL_SPOTLIGHT + LC_TRACKTOOL_CAMERA, // LC_TOOL_CAMERA + LC_TRACKTOOL_SELECT, // LC_TOOL_SELECT + LC_TRACKTOOL_MOVE_XYZ, // LC_TOOL_MOVE + LC_TRACKTOOL_ROTATE_XYZ, // LC_TOOL_ROTATE + LC_TRACKTOOL_ERASER, // LC_TOOL_ERASER + LC_TRACKTOOL_PAINT, // LC_TOOL_PAINT + LC_TRACKTOOL_COLOR_PICKER, // LC_TOOL_COLOR_PICKER + LC_TRACKTOOL_ZOOM, // LC_TOOL_ZOOM + LC_TRACKTOOL_PAN, // LC_TOOL_PAN + LC_TRACKTOOL_ORBIT_XY, // LC_TOOL_ROTATE_VIEW + LC_TRACKTOOL_ROLL, // LC_TOOL_ROLL + LC_TRACKTOOL_ZOOM_REGION // LC_TOOL_ZOOM_REGION }; return TrackToolFromTool[OverrideTool]; @@ -2407,9 +2407,9 @@ void View::UpdateTrackTool() NewTrackTool = LC_TRACKTOOL_PAINT; break; - case LC_TOOL_PIPETTE: - NewTrackTool = LC_TRACKTOOL_PIPETTE; - break; + case LC_TOOL_COLOR_PICKER: + NewTrackTool = LC_TRACKTOOL_COLOR_PICKER; + break; case LC_TOOL_ZOOM: NewTrackTool = LC_TRACKTOOL_ZOOM; @@ -2612,7 +2612,7 @@ void View::StartTracking(lcTrackButton TrackButton) case LC_TOOL_ERASER: case LC_TOOL_PAINT: - case LC_TOOL_PIPETTE: + case LC_TOOL_COLOR_PICKER: break; case LC_TOOL_ZOOM: @@ -2672,7 +2672,7 @@ void View::StopTracking(bool Accept) case LC_TOOL_ERASER: case LC_TOOL_PAINT: - case LC_TOOL_PIPETTE: + case LC_TOOL_COLOR_PICKER: break; case LC_TOOL_ZOOM: @@ -2824,9 +2824,9 @@ void View::OnButtonDown(lcTrackButton TrackButton) ActiveModel->PaintToolClicked(FindObjectUnderPointer(true, false).Object); break; - case LC_TRACKTOOL_PIPETTE: - ActiveModel->PipetteToolClicked(FindObjectUnderPointer(true, false).Object); - break; + case LC_TRACKTOOL_COLOR_PICKER: + ActiveModel->ColorPickerToolClicked(FindObjectUnderPointer(true, false).Object); + break; case LC_TRACKTOOL_ZOOM: case LC_TRACKTOOL_PAN: @@ -3226,7 +3226,7 @@ void View::OnMouseMove() case LC_TRACKTOOL_ERASER: case LC_TRACKTOOL_PAINT: - case LC_TRACKTOOL_PIPETTE: + case LC_TRACKTOOL_COLOR_PICKER: break; case LC_TRACKTOOL_ZOOM: diff --git a/common/view.h b/common/view.h index e9d68351..d6024e45 100644 --- a/common/view.h +++ b/common/view.h @@ -38,7 +38,7 @@ enum lcTrackTool LC_TRACKTOOL_SCALE_MINUS, LC_TRACKTOOL_ERASER, LC_TRACKTOOL_PAINT, - LC_TRACKTOOL_PIPETTE, + LC_TRACKTOOL_COLOR_PICKER, LC_TRACKTOOL_ZOOM, LC_TRACKTOOL_PAN, LC_TRACKTOOL_ORBIT_X, diff --git a/leocad.qrc b/leocad.qrc index 2759e5a6..4e138102 100644 --- a/leocad.qrc +++ b/leocad.qrc @@ -21,6 +21,8 @@ resources/file_print_preview_16.png resources/file_save_16.png resources/action_camera.png + resources/action_color_picker.png + resources/action_color_picker_16.png resources/action_delete.png resources/action_insert.png resources/action_light.png @@ -38,6 +40,7 @@ resources/action_zoom_extents.png resources/action_zoom_region.png resources/cursor_camera.png + resources/cursor_color_picker.png resources/cursor_delete.png resources/cursor_insert.png resources/cursor_light.png @@ -113,8 +116,5 @@ resources/shaders/unlit_view_sphere_ps.glsl resources/shaders/unlit_view_sphere_vs.glsl resources/gear_in.png - resources/action_pipette.png - resources/action_pipette_16.png - resources/cursor_pipette.png diff --git a/qt/lc_qglwidget.cpp b/qt/lc_qglwidget.cpp index e41010eb..b24d0371 100644 --- a/qt/lc_qglwidget.cpp +++ b/qt/lc_qglwidget.cpp @@ -59,7 +59,7 @@ void lcGLWidget::SetCursor(LC_CURSOR_TYPE CursorType) { 15, 15, ":/resources/cursor_rotatey" }, // LC_CURSOR_ROTATEY { 0, 10, ":/resources/cursor_delete" }, // LC_CURSOR_DELETE { 14, 14, ":/resources/cursor_paint" }, // LC_CURSOR_PAINT - { 14, 14, ":/resources/cursor_pipette" }, // LC_CURSOR_PIPETTE + { 1, 13, ":/resources/cursor_color_picker" }, // LC_CURSOR_COLOR_PICKER { 15, 15, ":/resources/cursor_zoom" }, // LC_CURSOR_ZOOM { 9, 9, ":/resources/cursor_zoom_region" }, // LC_CURSOR_ZOOM_REGION { 15, 15, ":/resources/cursor_pan" }, // LC_CURSOR_PAN diff --git a/resources/action_pipette.png b/resources/action_color_picker.png similarity index 100% rename from resources/action_pipette.png rename to resources/action_color_picker.png diff --git a/resources/action_pipette_16.png b/resources/action_color_picker_16.png similarity index 100% rename from resources/action_pipette_16.png rename to resources/action_color_picker_16.png diff --git a/resources/cursor_pipette.png b/resources/cursor_color_picker.png similarity index 100% rename from resources/cursor_pipette.png rename to resources/cursor_color_picker.png