Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-16 07:47:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Renamed pipette to color picker and fixed indentation.

Browse source
This commit is contained in:
Leonardo Zide 2020-02-15 11:14:12 -08:00
parent aa3ead6504
commit e5d06a29a2
13 changed files with 115 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/lc_commands.cpp
View file

@ -619,10 +619,10 @@ lcCommand gCommands[LC_NUM_COMMANDS] =
QT_TRANSLATE_NOOP("Status", "Change piece color"),
""
},
// LC_EDIT_ACTION_PIPETTE
// LC_EDIT_ACTION_COLOR_PICKER
{
QT_TRANSLATE_NOOP("Action", "Edit.Tool.Pipette"),
QT_TRANSLATE_NOOP("Menu", "Pipette"),
QT_TRANSLATE_NOOP("Action", "Edit.Tool.ColorPicker"),
QT_TRANSLATE_NOOP("Menu", "Color Picker"),
QT_TRANSLATE_NOOP("Status", "Get piece color"),
""
},
@ -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

4
common/lc_commands.h
View file

@ -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,

2
common/lc_glwidget.h
View file

@ -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,

16
common/lc_mainwindow.cpp
View file

@ -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,8 +3159,8 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId)
SetTool(LC_TOOL_PAINT);
break;
case LC_EDIT_ACTION_PIPETTE:
SetTool(LC_TOOL_PIPETTE);
case LC_EDIT_ACTION_COLOR_PICKER:
SetTool(LC_TOOL_COLOR_PICKER);
break;
case LC_EDIT_ACTION_ZOOM:

2
common/lc_model.cpp
View file

@ -4202,7 +4202,7 @@ void lcModel::PaintToolClicked(lcObject* Object)
}
}
void lcModel::PipetteToolClicked(lcObject* Object)
void lcModel::ColorPickerToolClicked(lcObject* Object)
{
if (!Object || Object->GetType() != LC_OBJECT_PIECE)
return;

2
common/lc_model.h
View file

@ -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);

20
common/view.cpp
View file

@ -479,7 +479,7 @@ LC_CURSOR_TYPE View::GetCursor() const
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_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
@ -1901,7 +1901,7 @@ lcTool View::GetCurrentTool() const
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_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
@ -1935,7 +1935,7 @@ lcTrackTool View::GetOverrideTrackTool(Qt::MouseButton Button) const
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_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
@ -2407,8 +2407,8 @@ void View::UpdateTrackTool()
NewTrackTool = LC_TRACKTOOL_PAINT;
break;
case LC_TOOL_PIPETTE:
NewTrackTool = LC_TRACKTOOL_PIPETTE;
case LC_TOOL_COLOR_PICKER:
NewTrackTool = LC_TRACKTOOL_COLOR_PICKER;
break;
case LC_TOOL_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,8 +2824,8 @@ void View::OnButtonDown(lcTrackButton TrackButton)
ActiveModel->PaintToolClicked(FindObjectUnderPointer(true, false).Object);
break;
case LC_TRACKTOOL_PIPETTE:
ActiveModel->PipetteToolClicked(FindObjectUnderPointer(true, false).Object);
case LC_TRACKTOOL_COLOR_PICKER:
ActiveModel->ColorPickerToolClicked(FindObjectUnderPointer(true, false).Object);
break;
case LC_TRACKTOOL_ZOOM:
@ -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:

2
common/view.h
View file

@ -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,

6
leocad.qrc
View file

@ -21,6 +21,8 @@
<file>resources/file_print_preview_16.png</file>
<file>resources/file_save_16.png</file>
<file>resources/action_camera.png</file>
<file>resources/action_color_picker.png</file>
<file>resources/action_color_picker_16.png</file>
<file>resources/action_delete.png</file>
<file>resources/action_insert.png</file>
<file>resources/action_light.png</file>
@ -38,6 +40,7 @@
<file>resources/action_zoom_extents.png</file>
<file>resources/action_zoom_region.png</file>
<file>resources/cursor_camera.png</file>
<file>resources/cursor_color_picker.png</file>
<file>resources/cursor_delete.png</file>
<file>resources/cursor_insert.png</file>
<file>resources/cursor_light.png</file>
@ -113,8 +116,5 @@
<file>resources/shaders/unlit_view_sphere_ps.glsl</file>
<file>resources/shaders/unlit_view_sphere_vs.glsl</file>
<file>resources/gear_in.png</file>
<file>resources/action_pipette.png</file>
<file>resources/action_pipette_16.png</file>
<file>resources/cursor_pipette.png</file>
</qresource>
</RCC>

2
qt/lc_qglwidget.cpp
View file

@ -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

0
resources/action_pipette.png → resources/action_color_picker.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 434 B

After

Width:  |  Height:  |  Size: 434 B

0
resources/action_pipette_16.png → resources/action_color_picker_16.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

0
resources/cursor_pipette.png → resources/cursor_color_picker.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B