0504合并前提交

scene/BarcodeEditor.ui

@@ -271,7 +271,7 @@ QSpinBox::down-arrow {
        <string>日期</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="btnCounter">
+     <widget class="QPushButton" name="btnCounter1">
       <property name="geometry">
        <rect>
         <x>60</x>
@@ -323,38 +323,6 @@ QSpinBox::down-arrow {
  </customwidgets>
  <resources/>
  <connections>
-  <connection>
-   <sender>closeBtn</sender>
-   <signal>clicked()</signal>
-   <receiver>BarcodeEditor</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>691</x>
-     <y>562</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>718</x>
-     <y>684</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBtn</sender>
-   <signal>clicked()</signal>
-   <receiver>BarcodeEditor</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>573</x>
-     <y>563</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>541</x>
-     <y>671</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>lineEditContent</sender>
    <signal>textChanged(QString)</signal>
@@ -378,7 +346,7 @@ QSpinBox::down-arrow {
    <slot>onBtnFormatClicked()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>518</x>
+     <x>412</x>
      <y>231</y>
     </hint>
     <hint type="destinationlabel">
@@ -395,7 +363,7 @@ QSpinBox::down-arrow {
    <hints>
     <hint type="sourcelabel">
      <x>562</x>
-     <y>325</y>
+     <y>255</y>
     </hint>
     <hint type="destinationlabel">
      <x>915</x>
@@ -404,14 +372,14 @@ QSpinBox::down-arrow {
    </hints>
   </connection>
   <connection>
-   <sender>btnCounter</sender>
+   <sender>btnCounter1</sender>
    <signal>clicked()</signal>
    <receiver>BarcodeEditor</receiver>
    <slot>onBtnCounterClicked()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>553</x>
-     <y>370</y>
+     <y>300</y>
     </hint>
     <hint type="destinationlabel">
      <x>819</x>
@@ -419,11 +387,45 @@ QSpinBox::down-arrow {
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>checkBtn</sender>
+   <signal>clicked()</signal>
+   <receiver>BarcodeEditor</receiver>
+   <slot>onCheckBtnClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>543</x>
+     <y>558</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>581</x>
+     <y>705</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>closeBtn</sender>
+   <signal>clicked()</signal>
+   <receiver>BarcodeEditor</receiver>
+   <slot>onCloseBtnClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>689</x>
+     <y>561</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>708</x>
+     <y>734</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>onContentChanged(QString)</slot>
   <slot>onBtnFormatClicked()</slot>
   <slot>onBtnDatetimeClicked()</slot>
   <slot>onBtnCounterClicked()</slot>
+  <slot>onCheckBtnClicked()</slot>
+  <slot>onCloseBtnClicked()</slot>
  </slots>
 </ui>