kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

changes in sketcher

Browse Source 
- Varios minor bug fixes.
- Added the other commands to the toolbar.
- Bug fix: missing AbortCommand().
- Mode Auto-switch to edge (Sponssi mode) has selection combo disabled to avoid interferring with this mode.
However, if auto-switch checkbox is unchecked (Jim-Abdullah mode), the combo is enabled and selection of
element type can be effected via the combo with the mouse.

In any case "z" shortcut iterates round robin the "valid types" of the preselected (hovered) element.
This commit is contained in:
Abdullah Tahiri
2014-08-05 16:59:39 +02:00
committed by wmayer
parent 09b8b25144
commit b5002dc6fe
5 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/Sketcher/Gui/Workbench.cpp
View File

@@ -37,7 +37,7 @@ using namespace SketcherGui;
qApp->translate("Workbench", "Sketcher");
qApp->translate("Workbench", "Sketcher geometries");
qApp->translate("Workbench", "Sketcher constraints");
qApp->translate("Workbench", "Sketcher accelerators");
qApp->translate("Workbench", "Sketcher tools");
#endif
/// @namespace SketcherGui @class Workbench
@@ -77,8 +77,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
addSketcherWorkbenchConstraints(*cons);
Gui::MenuItem* consaccel = new Gui::MenuItem();
consaccel->setCommand("Sketcher accelerators");
addSketcherWorkbenchAccelerators(*consaccel);
consaccel->setCommand("Sketcher tools");
addSketcherWorkbenchTools(*consaccel);
addSketcherWorkbenchSketchActions( *sketch );
*sketch << geom
@@ -105,8 +105,8 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
addSketcherWorkbenchConstraints( *cons );
Gui::ToolBarItem* consaccel = new Gui::ToolBarItem(root);
consaccel->setCommand("Sketcher accelerators");
addSketcherWorkbenchAccelerators( *consaccel );
consaccel->setCommand("Sketcher tools");
addSketcherWorkbenchTools( *consaccel );
return root;
}
@@ -200,10 +200,10 @@ inline void SketcherAddWorkbenchConstraints(T& cons){
}
template <typename T>
inline void SketcherAddWorkbenchAccelerators(T& consaccel);
inline void SketcherAddWorkbenchTools(T& consaccel);
template <>
inline void SketcherAddWorkbenchAccelerators<Gui::MenuItem>(Gui::MenuItem& consaccel){
inline void SketcherAddWorkbenchTools<Gui::MenuItem>(Gui::MenuItem& consaccel){
consaccel << "Sketcher_CloseShape"
<< "Sketcher_ConnectLines"
<< "Sketcher_SelectConstraints"
@@ -212,8 +212,10 @@ inline void SketcherAddWorkbenchAccelerators<Gui::MenuItem>(Gui::MenuItem& consa
<< "Sketcher_SelectHorizontalAxis";
}
template <>
inline void SketcherAddWorkbenchAccelerators<Gui::ToolBarItem>(Gui::ToolBarItem& consaccel){
consaccel << "Sketcher_CloseShape";
inline void SketcherAddWorkbenchTools<Gui::ToolBarItem>(Gui::ToolBarItem& consaccel){
consaccel << "Sketcher_CloseShape"
<< "Sketcher_ConnectLines"
<< "Sketcher_SelectConstraints";
}
template <typename T>
@@ -241,8 +243,8 @@ inline void Sketcher_addWorkbenchSketchActions(T& sketch){
void addSketcherWorkbenchConstraints( Gui::MenuItem& cons ){
SketcherAddWorkbenchConstraints( cons );
}
void addSketcherWorkbenchAccelerators( Gui::MenuItem& consaccel ){
SketcherAddWorkbenchAccelerators( consaccel );
void addSketcherWorkbenchTools( Gui::MenuItem& consaccel ){
SketcherAddWorkbenchTools( consaccel );
}
void addSketcherWorkbenchSketchActions( Gui::MenuItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );
@@ -254,9 +256,9 @@ void addSketcherWorkbenchGeometries( Gui::MenuItem& geom ){
void addSketcherWorkbenchConstraints( Gui::ToolBarItem& cons ){
SketcherAddWorkbenchConstraints( cons );
}
void addSketcherWorkbenchAccelerators( Gui::ToolBarItem& consaccel )
void addSketcherWorkbenchTools( Gui::ToolBarItem& consaccel )
{
SketcherAddWorkbenchAccelerators( consaccel );
SketcherAddWorkbenchTools( consaccel );
}
void addSketcherWorkbenchSketchActions( Gui::ToolBarItem& sketch ){
Sketcher_addWorkbenchSketchActions( sketch );