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

+ fix problems on unit tests, open transaction when creating distance object, layout warning, ...

Browse Source
This commit is contained in:
wmayer
2015-01-25 14:04:33 +01:00
parent 69605efc46
commit 85bc04f0a0
7 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Complete/Gui/Workbench.cpp
View File

@@ -172,7 +172,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Std_TextureMapping" << "Separator" << visu
<< "Std_ToggleVisibility" << "Std_ToggleNavigation"
<< "Std_SetAppearance" << "Std_RandomColor" << "Separator"
<< "Std_MeasureDistance" << "Separator"
<< "Std_Workbench" << "Std_ToolBarMenu" << "Std_DockViewMenu" << "Separator"
<< "Std_ViewStatusBar";
@@ -183,7 +182,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Std_DlgMacroRecord" << "Std_MacroStopRecord"
<< "Std_DlgMacroExecute" << "Std_DlgMacroExecuteDirect"
<< "Separator" << "Std_ViewScreenShot" << "Std_SceneInspector"
<< "Std_ExportGraphviz" << "Std_ProjectUtil"
<< "Std_ExportGraphviz" << "Std_ProjectUtil" << "Separator"
<< "Std_MeasureDistance" << "Separator"
<< "Std_DemoMode" << "Separator" << "Std_DlgCustomize";
// Mesh ****************************************************************************************************

11
src/Mod/Image/Gui/Workbench.cpp
View File

@@ -52,7 +52,10 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* root = StdWorkbench::setupToolBars();
Gui::ToolBarItem* part = new Gui::ToolBarItem(root);
part->setCommand("Image");
*part << "Image_Open" << "Image_CreateImagePlane"<< "Image_CapturerTest";
*part << "Image_Open" << "Image_CreateImagePlane";
#if HAVE_OPENCV2
*part << "Image_CapturerTest";
#endif
return root;
}
@@ -61,7 +64,9 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
Gui::ToolBarItem* root = new Gui::ToolBarItem;
Gui::ToolBarItem* img = new Gui::ToolBarItem(root);
img->setCommand("Image");
*img << "Image_Open" << "Image_CapturerTest";
*img << "Image_Open";
#if HAVE_OPENCV2
*img << "Image_CapturerTest";
#endif
return root;
}