From 9b67eff2d26fb0402e7fc1ffbef95714a32916e8 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 14 Jun 2019 00:27:36 +0200 Subject: [PATCH 1/3] clean-up CMake file --- src/Mod/Path/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 4af4012973..f58a886461 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -120,7 +120,6 @@ SET(PathScripts_post_SRCS PathScripts/post/dynapath_post.py PathScripts/post/example_pre.py PathScripts/post/grbl_post.py - PathScripts/post/grbl_G81_post.py PathScripts/post/jtech_post.py PathScripts/post/linuxcnc_post.py PathScripts/post/opensbp_post.py From d2bf707e7a682dc59f8973eed3d686bc5ee0c647 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 14 Jun 2019 11:30:43 +0200 Subject: [PATCH 2/3] Draft: QPixmap.fill expects a QColor, not an int or long --- src/Mod/Draft/DraftGui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index ad2bdc9b12..aa09b61dbf 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -765,7 +765,7 @@ class DraftToolBar: self.colorButton.setIcon(QtGui.QIcon(self.colorPix)) self.facecolorButton = self._pushbutton("facecolorButton",self.bottomtray, hide=False,square=True) self.facecolorPix = QtGui.QPixmap(16,16) - self.facecolorPix.fill(self.facecolor) + self.facecolorPix.fill(QtGui.QColor(self.facecolor)) self.facecolorButton.setIcon(QtGui.QIcon(self.facecolorPix)) p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General") bsize = p.GetInt("ToolbarIconSize",24)+2 From 3dc4776b0bca944390c2e660fa5f61da4ab6226f Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 14 Jun 2019 08:17:14 -0400 Subject: [PATCH 3/3] [AddonManager] create Resources/icons dir with SVG icons for WBs Forum thread: https://forum.freecadweb.org/viewtopic.php?f=9&t=36556&p=314330#p314330 --- .../Resources/icons/A2plus_workbench-icon.svg | 194 +++ .../icons/Airplane_workbench-icon.svg | 300 +++++ .../icons/Arch_Textures_workbench_icon.svg | 216 ++++ .../Resources/icons/BIM_workbench_icon.svg | 83 ++ .../Resources/icons/BOLTS_workbench_icon.svg | 84 ++ .../Resources/icons/Curves_workbench_icon.svg | 77 ++ .../icons/Defeaturing_workbench_icon.svg | 347 ++++++ .../Resources/icons/Dodo_workbench_icon.svg | 212 ++++ .../Resources/icons/EM_workbench_icon.svg | 602 ++++++++++ .../icons/ExplodedAssembly_workbench_icon.svg | 112 ++ .../icons/Fasteners_workbench_icon.svg | 1065 +++++++++++++++++ .../icons/Flamingo_workbench_icon.svg | 145 +++ .../Resources/icons/GDT_workbench_icon.svg | 420 +++++++ .../Resources/icons/Gears_workbench_icon.svg | 377 ++++++ .../Resources/icons/Glider_workbench_icon.svg | 188 +++ .../Kicad-StepUp-tools-workbench_icon.svg | 405 +++++++ .../icons/Lattice2_workbench_icon.svg | 273 +++++ .../icons/Lithophane_workbench_icon.svg | 117 ++ .../icons/Manipulator_workbench_icon.svg | 387 ++++++ .../icons/PartOMagic_workbench_icon.svg | 255 ++++ .../Resources/icons/Plot_workbench_icon.svg | 148 +++ .../Resources/icons/Pyrate_workbench_icon.svg | 140 +++ .../icons/Reporting_workbench_icon.svg | 102 ++ .../icons/SheetMetal_workbench_icon.svg | 751 ++++++++++++ .../Resources/icons/Ship_workbench_icon.svg | 157 +++ .../Resources/icons/Timber_workbench_icon.svg | 96 ++ .../Resources/icons/cfd_workbench_icon.svg | 56 + 27 files changed, 7309 insertions(+) create mode 100644 src/Mod/AddonManager/Resources/icons/A2plus_workbench-icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Airplane_workbench-icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Arch_Textures_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/BIM_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/BOLTS_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Curves_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Defeaturing_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Dodo_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/EM_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/ExplodedAssembly_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Fasteners_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Flamingo_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/GDT_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Gears_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Glider_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Kicad-StepUp-tools-workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Lattice2_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Lithophane_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Manipulator_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/PartOMagic_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Plot_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Pyrate_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Reporting_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/SheetMetal_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Ship_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/Timber_workbench_icon.svg create mode 100644 src/Mod/AddonManager/Resources/icons/cfd_workbench_icon.svg diff --git a/src/Mod/AddonManager/Resources/icons/A2plus_workbench-icon.svg b/src/Mod/AddonManager/Resources/icons/A2plus_workbench-icon.svg new file mode 100644 index 0000000000..a661bcedd6 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/A2plus_workbench-icon.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + Path-Stock + 2015-07-04 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Airplane_workbench-icon.svg b/src/Mod/AddonManager/Resources/icons/Airplane_workbench-icon.svg new file mode 100644 index 0000000000..03f4896f8e --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Airplane_workbench-icon.svg @@ -0,0 +1,300 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Arch_Textures_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Arch_Textures_workbench_icon.svg new file mode 100644 index 0000000000..3acdd00c6b --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Arch_Textures_workbench_icon.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/BIM_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/BIM_workbench_icon.svg new file mode 100644 index 0000000000..73a41130b7 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/BIM_workbench_icon.svg @@ -0,0 +1,83 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/BOLTS_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/BOLTS_workbench_icon.svg new file mode 100644 index 0000000000..ce124ff301 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/BOLTS_workbench_icon.svg @@ -0,0 +1,84 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Curves_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Curves_workbench_icon.svg new file mode 100644 index 0000000000..aed024a6cd --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Curves_workbench_icon.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Defeaturing_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Defeaturing_workbench_icon.svg new file mode 100644 index 0000000000..d7bb489b30 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Defeaturing_workbench_icon.svg @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [Yorik van Havre] + + + Arch_Pipe_Tree + 2016-08-24 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Dodo_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Dodo_workbench_icon.svg new file mode 100644 index 0000000000..0d2cd46e84 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Dodo_workbench_icon.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/AddonManager/Resources/icons/EM_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/EM_workbench_icon.svg new file mode 100644 index 0000000000..1288472bb4 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/EM_workbench_icon.svg @@ -0,0 +1,602 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + ArchWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/ArchWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/ExplodedAssembly_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/ExplodedAssembly_workbench_icon.svg new file mode 100644 index 0000000000..6879a75884 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/ExplodedAssembly_workbench_icon.svg @@ -0,0 +1,112 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Fasteners_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Fasteners_workbench_icon.svg new file mode 100644 index 0000000000..3a91a7b287 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Fasteners_workbench_icon.svg @@ -0,0 +1,1065 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/Mod/AddonManager/Resources/icons/Flamingo_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Flamingo_workbench_icon.svg new file mode 100644 index 0000000000..7ade88f6c5 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Flamingo_workbench_icon.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Mod/AddonManager/Resources/icons/GDT_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/GDT_workbench_icon.svg new file mode 100644 index 0000000000..ea4ef88e68 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/GDT_workbench_icon.svg @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Gears_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Gears_workbench_icon.svg new file mode 100644 index 0000000000..3e199cd8a5 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Gears_workbench_icon.svg @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Glider_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Glider_workbench_icon.svg new file mode 100644 index 0000000000..b299004c8a --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Glider_workbench_icon.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Kicad-StepUp-tools-workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Kicad-StepUp-tools-workbench_icon.svg new file mode 100644 index 0000000000..3b9262de23 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Kicad-StepUp-tools-workbench_icon.svg @@ -0,0 +1,405 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Lattice2_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Lattice2_workbench_icon.svg new file mode 100644 index 0000000000..9d792930f9 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Lattice2_workbench_icon.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Lithophane_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Lithophane_workbench_icon.svg new file mode 100644 index 0000000000..1101468760 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Lithophane_workbench_icon.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Manipulator_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Manipulator_workbench_icon.svg new file mode 100644 index 0000000000..03a34de896 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Manipulator_workbench_icon.svg @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Mon Oct 10 13:44:52 2011 +0000 + + + [wmayer] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Move.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + [agryson] Alexander Gryson + + + + + arrow + move + arrows + compass + cross + + + Four equally sized arrow heads at 90° to eachother, all joined at the tail + + + + diff --git a/src/Mod/AddonManager/Resources/icons/PartOMagic_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/PartOMagic_workbench_icon.svg new file mode 100644 index 0000000000..1b4675d0fc --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/PartOMagic_workbench_icon.svg @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Plot_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Plot_workbench_icon.svg new file mode 100644 index 0000000000..f6bf8716b0 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Plot_workbench_icon.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + PlotWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Plot/resources/icons/PlotWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Pyrate_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Pyrate_workbench_icon.svg new file mode 100644 index 0000000000..3652724320 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Pyrate_workbench_icon.svg @@ -0,0 +1,140 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Reporting_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Reporting_workbench_icon.svg new file mode 100644 index 0000000000..d9a0fdd1ac --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Reporting_workbench_icon.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/SheetMetal_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/SheetMetal_workbench_icon.svg new file mode 100644 index 0000000000..0de9d9d024 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/SheetMetal_workbench_icon.svg @@ -0,0 +1,751 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/Mod/AddonManager/Resources/icons/Ship_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Ship_workbench_icon.svg new file mode 100644 index 0000000000..412d96de80 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Ship_workbench_icon.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [triplus] + + + ShipWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Ship/resources/icons/ShipWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/Timber_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/Timber_workbench_icon.svg new file mode 100644 index 0000000000..61dfbf8d4b --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/Timber_workbench_icon.svg @@ -0,0 +1,96 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/Mod/AddonManager/Resources/icons/cfd_workbench_icon.svg b/src/Mod/AddonManager/Resources/icons/cfd_workbench_icon.svg new file mode 100644 index 0000000000..c94d729651 --- /dev/null +++ b/src/Mod/AddonManager/Resources/icons/cfd_workbench_icon.svg @@ -0,0 +1,56 @@ + + + + + + image/svg+xml + + + + + + + +