Merge remote-tracking branch 'Lcvette/master'

Author: TurBoss

probe_basic/probe_basic.ui

@@ -224,7 +224,7 @@ bottom-margin: 0px;
            <enum>QTabWidget::South</enum>
           </property>
           <property name="currentIndex">
-           <number>2</number>
+           <number>4</number>
           </property>
           <widget class="QWidget" name="main_tab">
            <attribute name="title">
@@ -8832,6 +8832,9 @@ OFFSET</string>
                          <height>40</height>
                         </size>
                        </property>
+                       <property name="whatsThis">
+                        <string>G30.1 Sets the position for tool touch off location</string>
+                       </property>
                        <property name="styleSheet">
                         <string notr="true">MDIButton {
    	font: 15pt &quot;Bebas Kai&quot;;
@@ -16321,7 +16324,7 @@ QTabBar::tab:only-one {
                <enum>QTabWidget::Rounded</enum>
               </property>
               <property name="currentIndex">
-               <number>0</number>
+               <number>1</number>
               </property>
               <widget class="QWidget" name="holeop_tab">
                <attribute name="title">
@@ -21767,6 +21770,15 @@ border-radius: 1px;
                <height>40</height>
               </size>
              </property>
+             <property name="toolTip">
+              <string>M6 Tool Change command that will perform a tool change to the tool specified in the adjacent 'T' Box</string>
+             </property>
+             <property name="toolTipDuration">
+              <number>3</number>
+             </property>
+             <property name="whatsThis">
+              <string>M6 Tool Change command that will perform a tool change to the tool specified in the adjacent 'T' Box</string>
+             </property>
              <property name="styleSheet">
               <string notr="true">QPushButton {
    	font: 15pt &quot;Bebas Kai&quot;;
@@ -27011,12 +27023,12 @@ font: 11pt bebas kai;
   </property>
  </designerdata>
  <buttongroups>
-  <buttongroup name="probetabGroup"/>
-  <buttongroup name="plotorthoperspbtnGroup"/>
   <buttongroup name="plotviewGroup"/>
-  <buttongroup name="proberoutinebtnGroup"/>
-  <buttongroup name="probemodeGroup"/>
   <buttongroup name="mainorthoperspbtnGroup"/>
+  <buttongroup name="probemodeGroup"/>
+  <buttongroup name="plotorthoperspbtnGroup"/>
+  <buttongroup name="proberoutinebtnGroup"/>
+  <buttongroup name="probetabGroup"/>
   <buttongroup name="xycalbtnGroup"/>
   <buttongroup name="probehelpGroup"/>
  </buttongroups>