Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-06 08:46:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added selection mode button to toolbar.

Browse source
This commit is contained in:
Leonardo Zide 2017-11-23 18:31:55 -08:00
parent 6878d0157f
commit f51f8d205c
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/lc_mainwindow.cpp
View file

@ -259,6 +259,7 @@ void lcMainWindow::CreateActions()
mActions[LC_EDIT_ACTION_ROTATE_VIEW]->setIcon(QIcon(":/resources/action_rotate_view.png")); mActions[LC_EDIT_ACTION_ROTATE_VIEW]->setIcon(QIcon(":/resources/action_rotate_view.png"));
mActions[LC_EDIT_ACTION_ROLL]->setIcon(QIcon(":/resources/action_roll.png")); mActions[LC_EDIT_ACTION_ROLL]->setIcon(QIcon(":/resources/action_roll.png"));
mActions[LC_EDIT_ACTION_ZOOM_REGION]->setIcon(QIcon(":/resources/action_zoom_region.png")); mActions[LC_EDIT_ACTION_ZOOM_REGION]->setIcon(QIcon(":/resources/action_zoom_region.png"));
mActions[LC_EDIT_FIND]->setIcon(QIcon(":/resources/edit_find.png"));
mActions[LC_EDIT_TRANSFORM_RELATIVE]->setIcon(QIcon(":/resources/edit_transform_relative.png")); mActions[LC_EDIT_TRANSFORM_RELATIVE]->setIcon(QIcon(":/resources/edit_transform_relative.png"));
mActions[LC_PIECE_SHOW_EARLIER]->setIcon(QIcon(":/resources/piece_show_earlier.png")); mActions[LC_PIECE_SHOW_EARLIER]->setIcon(QIcon(":/resources/piece_show_earlier.png"));
mActions[LC_PIECE_SHOW_LATER]->setIcon(QIcon(":/resources/piece_show_later.png")); mActions[LC_PIECE_SHOW_LATER]->setIcon(QIcon(":/resources/piece_show_later.png"));
@ -453,7 +454,6 @@ void lcMainWindow::CreateMenus()
EditMenu->addSeparator(); EditMenu->addSeparator();
EditMenu->addAction(mActions[LC_EDIT_FIND]); EditMenu->addAction(mActions[LC_EDIT_FIND]);
mActions[LC_EDIT_FIND]->setIcon(QIcon(":/resources/edit_find.png"));
EditMenu->addAction(mActions[LC_EDIT_FIND_NEXT]); EditMenu->addAction(mActions[LC_EDIT_FIND_NEXT]);
EditMenu->addAction(mActions[LC_EDIT_FIND_PREVIOUS]); EditMenu->addAction(mActions[LC_EDIT_FIND_PREVIOUS]);
EditMenu->addSeparator(); EditMenu->addSeparator();
@ -462,9 +462,7 @@ void lcMainWindow::CreateMenus()
EditMenu->addAction(mActions[LC_EDIT_SELECT_INVERT]); EditMenu->addAction(mActions[LC_EDIT_SELECT_INVERT]);
EditMenu->addAction(mActions[LC_EDIT_SELECT_BY_NAME]); EditMenu->addAction(mActions[LC_EDIT_SELECT_BY_NAME]);
EditMenu->addAction(mActions[LC_EDIT_SELECT_BY_COLOR]); EditMenu->addAction(mActions[LC_EDIT_SELECT_BY_COLOR]);
QMenu* SelectionModeMenu = EditMenu->addMenu(tr("Selection Mode")); EditMenu->addMenu(mSelectionModeMenu);
for (int ModeIdx = LC_EDIT_SELECTION_MODE_FIRST; ModeIdx <= LC_EDIT_SELECTION_MODE_LAST; ModeIdx++)
SelectionModeMenu->addAction(mActions[ModeIdx]);
EditMenu->addSeparator(); EditMenu->addSeparator();
EditMenu->addMenu(mToolsMenu); EditMenu->addMenu(mToolsMenu);
@ -544,6 +542,15 @@ void lcMainWindow::CreateMenus()
void lcMainWindow::CreateToolBars() void lcMainWindow::CreateToolBars()
{ {
mSelectionModeMenu = new QMenu(tr("Selection Mode"), this);
for (int ModeIdx = LC_EDIT_SELECTION_MODE_FIRST; ModeIdx <= LC_EDIT_SELECTION_MODE_LAST; ModeIdx++)
mSelectionModeMenu->addAction(mActions[ModeIdx]);
QAction* SelectionModeAction = new QAction(tr("Selection Mode"), this);
SelectionModeAction->setStatusTip(tr("Change selection mode"));
SelectionModeAction->setIcon(QIcon(":/resources/action_select.png"));
SelectionModeAction->setMenu(mSelectionModeMenu);
QMenu* SnapXYMenu = new QMenu(tr("Snap XY"), this); QMenu* SnapXYMenu = new QMenu(tr("Snap XY"), this);
for (int actionIdx = LC_EDIT_SNAP_MOVE_XY0; actionIdx <= LC_EDIT_SNAP_MOVE_XY9; actionIdx++) for (int actionIdx = LC_EDIT_SNAP_MOVE_XY0; actionIdx <= LC_EDIT_SNAP_MOVE_XY9; actionIdx++)
SnapXYMenu->addAction(mActions[actionIdx]); SnapXYMenu->addAction(mActions[actionIdx]);
@ -583,9 +590,11 @@ void lcMainWindow::CreateToolBars()
mStandardToolBar->addAction(mActions[LC_EDIT_UNDO]); mStandardToolBar->addAction(mActions[LC_EDIT_UNDO]);
mStandardToolBar->addAction(mActions[LC_EDIT_REDO]); mStandardToolBar->addAction(mActions[LC_EDIT_REDO]);
mStandardToolBar->addSeparator(); mStandardToolBar->addSeparator();
mStandardToolBar->addAction(SelectionModeAction);
mStandardToolBar->addAction(mActions[LC_EDIT_TRANSFORM_RELATIVE]); mStandardToolBar->addAction(mActions[LC_EDIT_TRANSFORM_RELATIVE]);
mStandardToolBar->addAction(MoveAction); mStandardToolBar->addAction(MoveAction);
mStandardToolBar->addAction(AngleAction); mStandardToolBar->addAction(AngleAction);
((QToolButton*)mStandardToolBar->widgetForAction(SelectionModeAction))->setPopupMode(QToolButton::InstantPopup);
((QToolButton*)mStandardToolBar->widgetForAction(MoveAction))->setPopupMode(QToolButton::InstantPopup); ((QToolButton*)mStandardToolBar->widgetForAction(MoveAction))->setPopupMode(QToolButton::InstantPopup);
((QToolButton*)mStandardToolBar->widgetForAction(AngleAction))->setPopupMode(QToolButton::InstantPopup); ((QToolButton*)mStandardToolBar->widgetForAction(AngleAction))->setPopupMode(QToolButton::InstantPopup);

1
common/lc_mainwindow.h
View file

@ -381,6 +381,7 @@ protected:
QMenu* mCameraMenu; QMenu* mCameraMenu;
QMenu* mProjectionMenu; QMenu* mProjectionMenu;
QMenu* mShadingMenu; QMenu* mShadingMenu;
QMenu* mSelectionModeMenu;
}; };
extern class lcMainWindow* gMainWindow; extern class lcMainWindow* gMainWindow;