0504合并前提交

QtUI.pro

@@ -132,6 +132,10 @@ HEADERS +=  Public.h \
     scene/BarcodeEditor.h \
     scene/DateFormatEditor.h \
     scene/ViewModels.h \
+    scene/CounterEditor.h \
+    scene/ItemCommon.h \
+    scene/DlgBarcodeFormat.h \
+    scene/DlgQrcodeFormat.h \
     CounterVarSet.h \
     SystemUpdate.h \
     dialogmaintenancetimesetting.h \
@@ -203,6 +207,9 @@ FORMS += \
     scene/BarcodeEditor.ui \
     scene/DateFormatEditor.ui \
     scene/DateReplaceEditor.ui \
+    scene/CounterEditor.ui \
+    scene/DlgBarcodeFormat.ui \
+    scene/DlgQrcodeFormat.ui \
     dlgQrCode.ui
 
 SOURCES +=\
@@ -255,6 +262,10 @@ SOURCES +=\
     scene/PicCounterItem.cpp \
     scene/ViewModels.cpp \
     scene/DateReplaceEditor.cpp \
+    scene/CounterEditor.cpp \
+    scene/ItemCommon.cpp \
+    scene/DlgBarcodeFormat.cpp \
+    scene/DlgQrcodeFormat.cpp \
     DialogSaveFile.cpp \
     DialogFileOperation.cpp \
     DateVarSet.cpp \