From ec8e97c262bd957342eea38747e3db69d100dd51 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Sun, 2 Sep 2018 00:31:56 -0700
Subject: [PATCH] Fixed merge issues

---
 src/Mod/Path/Gui/Resources/panels/PathEdit.ui | 22 ++++++++++++-------
 src/Mod/Path/PathScripts/PathAreaOp.py        |  2 +-
 src/Mod/Path/PathScripts/PathJobGui.py        |  6 ++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
index ece015da33..ccc8ef4458 100644
--- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
@@ -14,7 +14,7 @@
    <string>Job Edit</string>
   </property>
   <property name="currentIndex">
-   <number>0</number>
+   <number>2</number>
   </property>
   <widget class="QWidget" name="tabGeneral">
    <attribute name="title">
@@ -31,8 +31,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>410</width>
-         <height>572</height>
+         <width>412</width>
+         <height>549</height>
         </rect>
        </property>
        <attribute name="label">
@@ -96,8 +96,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>100</width>
-         <height>30</height>
+         <width>96</width>
+         <height>26</height>
         </rect>
        </property>
        <attribute name="label">
@@ -189,7 +189,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>414</width>
+         <width>418</width>
          <height>762</height>
         </rect>
        </property>
@@ -211,6 +211,12 @@
              <layout class="QHBoxLayout" name="horizontalLayout_5">
               <item>
                <widget class="QComboBox" name="stock">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="currentIndex">
                  <number>2</number>
                 </property>
@@ -237,9 +243,9 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="updateStock">
+               <widget class="QPushButton" name="refreshStock">
                 <property name="text">
-                 <string>New</string>
+                 <string>Refresh</string>
                 </property>
                </widget>
               </item>
diff --git a/src/Mod/Path/PathScripts/PathAreaOp.py b/src/Mod/Path/PathScripts/PathAreaOp.py
index a1501ade22..158eb9e8b7 100644
--- a/src/Mod/Path/PathScripts/PathAreaOp.py
+++ b/src/Mod/Path/PathScripts/PathAreaOp.py
@@ -136,7 +136,7 @@ class ObjectOp(PathOp.ObjectOp):
         '''areaOpOnDocumentRestored(obj) ... overwrite to fully restore receiver'''
         pass
 
-    def opSetDefaultValues(self, obj):
+    def opSetDefaultValues(self, obj, job):
         '''opSetDefaultValues(obj) ... base implementation, do not overwrite.
         The base implementation sets the depths and heights based on the
         areaOpShapeForDepths() return value.
diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py
index a59f24f578..d209f6da95 100644
--- a/src/Mod/Path/PathScripts/PathJobGui.py
+++ b/src/Mod/Path/PathScripts/PathJobGui.py
@@ -921,10 +921,10 @@ class TaskPanel:
         if -1 != index:
             self.template.updateUI()
 
-   def updateStock(self):
+    def refreshStock(self):
         self.updateStockEditor(self.form.stock.currentIndex())
 
-   def centerInStock(self):
+    def centerInStock(self):
         bbb = self.obj.Base.Shape.BoundBox
         bbs = self.obj.Stock.Shape.BoundBox
         by = bbs.Center - bbb.Center
@@ -1016,7 +1016,7 @@ class TaskPanel:
         self.form.centerInStockXY.clicked.connect(self.centerInStockXY)
 
         self.form.stock.currentIndexChanged.connect(self.updateStockEditor)
-        self.form.updateStock.clicked.connect(self.updateStock)
+        self.form.refreshStock.clicked.connect(self.refreshStock)
 
         self.form.orientXAxis.clicked.connect(lambda: self.orientSelected(FreeCAD.Vector(1, 0, 0)))
         self.form.orientYAxis.clicked.connect(lambda: self.orientSelected(FreeCAD.Vector(0, 1, 0)))