diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index eccec0dcb2..744fdd8ce9 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -27,7 +27,7 @@ macro(PrintFinalReport) message(STATUS "pybind11: not enabled") endif(DEFINED pybind11_FOUND) - message(STATUS "Boost: ${Boost_VERSION}") + message(STATUS "Boost: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} (${Boost_VERSION})") message(STATUS "XercesC: [${XercesC_LIBRARIES}] [${XercesC_INCLUDE_DIRS}]") diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 61da237044..b225764910 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -863,6 +863,7 @@ StdCmdToggleVisibility::StdCmdToggleVisibility() sToolTipText = QT_TR_NOOP("Toggles visibility"); sStatusTip = QT_TR_NOOP("Toggles visibility"); sWhatsThis = "Std_ToggleVisibility"; + sPixmap = "Std_ToggleVisibility"; sAccel = "Space"; eType = Alter3DView; } @@ -939,6 +940,7 @@ StdCmdShowSelection::StdCmdShowSelection() sToolTipText = QT_TR_NOOP("Show all selected objects"); sStatusTip = QT_TR_NOOP("Show all selected objects"); sWhatsThis = "Std_ShowSelection"; + sPixmap = "Std_ShowSelection"; eType = Alter3DView; } @@ -966,6 +968,7 @@ StdCmdHideSelection::StdCmdHideSelection() sToolTipText = QT_TR_NOOP("Hide all selected objects"); sStatusTip = QT_TR_NOOP("Hide all selected objects"); sWhatsThis = "Std_HideSelection"; + sPixmap = "Std_HideSelection"; eType = Alter3DView; } @@ -993,6 +996,7 @@ StdCmdSelectVisibleObjects::StdCmdSelectVisibleObjects() sToolTipText = QT_TR_NOOP("Select visible objects in the active document"); sStatusTip = QT_TR_NOOP("Select visible objects in the active document"); sWhatsThis = "Std_SelectVisibleObjects"; + sPixmap = "Std_SelectVisibleObjects"; eType = Alter3DView; } @@ -1034,6 +1038,7 @@ StdCmdToggleObjects::StdCmdToggleObjects() sToolTipText = QT_TR_NOOP("Toggles visibility of all objects in the active document"); sStatusTip = QT_TR_NOOP("Toggles visibility of all objects in the active document"); sWhatsThis = "Std_ToggleObjects"; + sPixmap = "Std_ToggleObjects"; eType = Alter3DView; } @@ -1074,6 +1079,7 @@ StdCmdShowObjects::StdCmdShowObjects() sToolTipText = QT_TR_NOOP("Show all objects in the document"); sStatusTip = QT_TR_NOOP("Show all objects in the document"); sWhatsThis = "Std_ShowObjects"; + sPixmap = "Std_ShowObjects"; eType = Alter3DView; } @@ -1110,6 +1116,7 @@ StdCmdHideObjects::StdCmdHideObjects() sToolTipText = QT_TR_NOOP("Hide all objects in the document"); sStatusTip = QT_TR_NOOP("Hide all objects in the document"); sWhatsThis = "Std_HideObjects"; + sPixmap = "Std_HideObjects"; eType = Alter3DView; } @@ -2436,7 +2443,7 @@ StdCmdViewIvIssueCamPos::StdCmdViewIvIssueCamPos() sToolTipText = QT_TR_NOOP("Issue the camera position to the console and to a macro, to easily recall this position"); sWhatsThis = "Std_ViewIvIssueCamPos"; sStatusTip = QT_TR_NOOP("Issue the camera position to the console and to a macro, to easily recall this position"); - sPixmap = "Std_Tool8"; + sPixmap = "Std_ViewIvIssueCamPos"; eType = Alter3DView; } diff --git a/src/Gui/Icons/Std_HideObjects.svg b/src/Gui/Icons/Std_HideObjects.svg new file mode 100644 index 0000000000..2453750545 --- /dev/null +++ b/src/Gui/Icons/Std_HideObjects.svg @@ -0,0 +1,518 @@ + + + Std_HideObjects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_HideObjects + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + box + page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_HideSelection.svg b/src/Gui/Icons/Std_HideSelection.svg new file mode 100644 index 0000000000..08eb31a483 --- /dev/null +++ b/src/Gui/Icons/Std_HideSelection.svg @@ -0,0 +1,209 @@ + + + Std_HideSelection + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_HideSelection + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + arrow + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_SelectVisibleObjects.svg b/src/Gui/Icons/Std_SelectVisibleObjects.svg new file mode 100644 index 0000000000..5a576ed73f --- /dev/null +++ b/src/Gui/Icons/Std_SelectVisibleObjects.svg @@ -0,0 +1,304 @@ + + + Std_SelectVisibleObjects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_SelectVisibleObjects + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + arrow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_ShowObjects.svg b/src/Gui/Icons/Std_ShowObjects.svg new file mode 100644 index 0000000000..d00f63b68e --- /dev/null +++ b/src/Gui/Icons/Std_ShowObjects.svg @@ -0,0 +1,554 @@ + + + Std_ShowObjects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_ShowObjects + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + cube + page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_ShowSelection.svg b/src/Gui/Icons/Std_ShowSelection.svg new file mode 100644 index 0000000000..8282ffd0bd --- /dev/null +++ b/src/Gui/Icons/Std_ShowSelection.svg @@ -0,0 +1,223 @@ + + + Std_ShowSelection + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_ShowSelection + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + arrow + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_ToggleObjects.svg b/src/Gui/Icons/Std_ToggleObjects.svg new file mode 100644 index 0000000000..79a9e81d25 --- /dev/null +++ b/src/Gui/Icons/Std_ToggleObjects.svg @@ -0,0 +1,477 @@ + + + Std_ToggleObjects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_ToggleObjects + 2020/12/25 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + + + eye + page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_ToggleVisibility.svg b/src/Gui/Icons/Std_ToggleVisibility.svg new file mode 100644 index 0000000000..bd0d717f70 --- /dev/null +++ b/src/Gui/Icons/Std_ToggleVisibility.svg @@ -0,0 +1,172 @@ + + + Std_ToggleVisibility + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_ToggleVisibility + + + + + + + + + + + + + diff --git a/src/Gui/Icons/Std_ViewIvIssueCamPos.svg b/src/Gui/Icons/Std_ViewIvIssueCamPos.svg new file mode 100644 index 0000000000..654c096c46 --- /dev/null +++ b/src/Gui/Icons/Std_ViewIvIssueCamPos.svg @@ -0,0 +1,172 @@ + + + Std_ViewIvIssueCamPos + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Std_ViewIvIssueCamPos + 2020/12/10 + + + [bitacovir] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index 5ce4ef6fc4..597b985081 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -156,6 +156,8 @@ Std_CloseActiveWindow.svg Std_CloseAllWindows.svg Std_Export.svg + Std_HideObjects.svg + Std_HideSelection.svg Std_Import.svg Std_MergeProjects.svg Std_PrintPdf.svg @@ -164,10 +166,15 @@ Std_Revert.svg Std_SaveAll.svg Std_SaveCopy.svg + Std_SelectVisibleObjects.svg Std_SetAppearance.svg + Std_ShowObjects.svg + Std_ShowSelection.svg Std_TextureMapping.svg Std_ToggleClipPlane.svg Std_ToggleNavigation.svg + Std_ToggleObjects.svg + Std_ToggleVisibility.svg Std_Tool1.svg Std_Tool2.svg Std_Tool3.svg @@ -182,6 +189,7 @@ Std_Tool12.svg Std_ViewDimetric.svg Std_ViewHome.svg + Std_ViewIvIssueCamPos.svg Std_ViewIvStereoInterleavedColumns.svg Std_ViewIvStereoInterleavedRows.svg Std_ViewIvStereoOff.svg diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index afa607c1dc..9aa8818b2e 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -320,7 +320,7 @@ def getSVG(source, lineColor=(0.0, 0.0, 0.0), fontsize=1, showFill=False, - fillColor=(0.8, 0.8, 0.8), + fillColor=(1.0, 1.0, 1.0), techdraw=False, fillSpaces=False, cutlinewidth=0, @@ -400,10 +400,10 @@ def getSVG(source, svgSymbolLineWidth = str(linewidth * yt) hiddenPattern = archUserParameters.GetString("archHiddenPattern","30,10") svgHiddenPattern = hiddenPattern.replace(" ","") - fillpattern = ' 0 0 - 453 - 424 + 416 + 542 @@ -22,6 +22,18 @@ + + + 0 + 0 + + + + + 60 + 0 + + The name of your style. Existing style names can be edited. @@ -46,11 +58,17 @@ false - + 0 0 + + + 60 + 0 + + 110 @@ -71,11 +89,17 @@ false - + 0 0 + + + 60 + 0 + + 110 @@ -90,6 +114,26 @@ + + + + Import styles from json file + + + + + + + + + + Export styles to json file + + + + + + @@ -108,8 +152,8 @@ 0 - -290 - 420 + 0 + 383 589 @@ -152,6 +196,18 @@ + + + 0 + 0 + + + + + 60 + 0 + + The font to use for texts and dimensions @@ -400,6 +456,18 @@ + + + 0 + 0 + + + + + 60 + 0 + + The type of arrows or markers to use at the end of dimension lines diff --git a/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py b/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py index ffeaca51b4..82be6d8539 100644 --- a/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py +++ b/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py @@ -111,6 +111,8 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest): self.form.pushButtonRename.setIcon(QtGui.QIcon(":/icons/accessories-text-editor.svg")) self.form.pushButtonDelete.resize(self.form.pushButtonDelete.sizeHint()) self.form.pushButtonRename.resize(self.form.pushButtonRename.sizeHint()) + self.form.pushButtonImport.setIcon(QtGui.QIcon(":/icons/Std_Import.svg")) + self.form.pushButtonExport.setIcon(QtGui.QIcon(":/icons/Std_Export.svg")) # fill the styles combo self.styles = self.read_meta() @@ -121,6 +123,8 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest): self.form.comboBoxStyles.currentIndexChanged.connect(self.on_style_changed) self.form.pushButtonDelete.clicked.connect(self.on_delete) self.form.pushButtonRename.clicked.connect(self.on_rename) + self.form.pushButtonImport.clicked.connect(self.on_import) + self.form.pushButtonExport.clicked.connect(self.on_export) for attr in DEFAULT.keys(): control = getattr(self.form, attr) for signal in ("clicked", "textChanged", @@ -280,6 +284,42 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest): self.styles[newname] = value self.renamed[style] = newname + + def on_import(self): + """imports styles from a json file""" + filename = QtGui.QFileDialog.getOpenFileName( + QtGui.QApplication.activeWindow(), + _tr("Open styles file"), + None, + _tr("JSON file (*.json)")) + if filename and filename[0]: + with open(filename[0]) as f: + nstyles = json.load(f) + if nstyles: + self.styles.update(nstyles) + l1 = self.form.comboBoxStyles.itemText(0) + l2 = self.form.comboBoxStyles.itemText(1) + self.form.comboBoxStyles.clear() + self.form.comboBoxStyles.addItem(l1) + self.form.comboBoxStyles.addItem(l2) + for style in self.styles.keys(): + self.form.comboBoxStyles.addItem(style) + print("Styles updated from "+filename[0]) + + + def on_export(self): + """exports styles to a json file""" + filename = QtGui.QFileDialog.getSaveFileName( + QtGui.QApplication.activeWindow(), + _tr("Save styles file"), + None, + _tr("JSON file (*.json)")) + if filename and filename[0]: + with open(filename[0],"w") as f: + json.dump(self.styles,f,indent=4) + print("Styles saved to "+filename[0]) + + def fill_editor(self, style): """Fill the editor fields with the contents of a style.""" if style is None: diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index 5177dcf8f8..2ec0a12615 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -141,6 +141,12 @@ SOURCE_GROUP("Module" FILES ${Mod_SRCS}) add_library(Path SHARED ${Path_SRCS}) target_link_libraries(Path ${Path_LIBS}) +# Boost >= 1.75.0 +if(NOT ${Boost_VERSION} LESS 107500) + set_target_properties(Path PROPERTIES CXX_STANDARD_REQUIRED ON) + set_target_properties(Path PROPERTIES CXX_STANDARD 14) +endif() + if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" Path_CPP_SRCS ${Path_SRCS}) diff --git a/src/Mod/Start/StartPage/StartPage.html b/src/Mod/Start/StartPage/StartPage.html index 346eedff7e..36a3bf2aa0 100644 --- a/src/Mod/Start/StartPage/StartPage.html +++ b/src/Mod/Start/StartPage/StartPage.html @@ -11,7 +11,7 @@
VERSIONSTRING - +
diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py index 512ce19e9f..dbe76a34d5 100644 --- a/src/Mod/Start/StartPage/TranslationTexts.py +++ b/src/Mod/Start/StartPage/TranslationTexts.py @@ -79,3 +79,4 @@ T_EXTERNALLINKS = translate("StartPage", "To open any of the links above in your T_CREATIONDATE = translate("StartPage", "Creation date") T_LASTMODIFIED = translate("StartPage", "Last modification") T_NOTES = translate("StartPage", "Notes") +T_VTOOLTIP = translate("StartPage", "Open start page preferences")