V6.7.5_beta

testprintwidget.h

@@ -7,7 +7,6 @@
 #include <QLineEdit>
 #include <QXmlStreamReader>
 #include "DialogSaveFile.h"
-#include "DialogFileOperation.h"
 #include <QGraphicsView>
 // 包含UI自动生成的头文件
 #include "ui_TestPrintWidget.h"
@@ -26,6 +25,7 @@
 #include <scene/piccodeitem.h>
 #include "CounterVarSet.h"
 #include "scene/BarcodeEditor.h"
+#include "Printsetting.h"
 
 typedef struct ItemReplaceInfo
 {
@@ -39,8 +39,6 @@ typedef struct ItemReplaceInfo
 #define SOURCE_COUNTER1 "Counter1_QvQ"
 #define SOURCE_COUNTER2 "Counter2_QvQ"
 
-class PrintSetting;
-
 class TestPrintWidget : public QWidget
 {
     Q_OBJECT
@@ -49,21 +47,13 @@ public:
     TestPrintWidget(QWidget* parent = nullptr);
     ~TestPrintWidget();
 
-    // 打开最后一次作业文件
-    void loadLastWork();
-
-    void on_buttonSelectFont_pressed();
-    void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
-    void setFontFormat(int fontsize,QString fontfamily);
     QTextEdit* getQTextEdit();
     PicScene* getPicScene();
 
     void getShowSelectItemText();
     void bindSysPara(SysPara *sysPara);
 
-    void on_openfileButton_pressed();
-
-    void saveFile();
+    void saveFile(const QString& filename = nullptr);
 
     void on_KeyUp_clicked();
     void on_KeyLeft_clicked();
@@ -82,9 +72,6 @@ public:
 
     QString currentFile();
 
-    bool addItemFlag;
-//    QString getReplateAfterStr(QString);
-
 public slots:
     void on_enlargeButton_pressed();
     void on_addButton_pressed(const SourceType type = SourceType::UNKNOWN);
@@ -93,7 +80,7 @@ public slots:
     void on_saveButton_pressed();
     void onSaveASFile(QString filename,bool Flag);
 
-    void onFileOpen(QString filePath,bool insertFlag);
+    void openWorkFile(QString filePath);
 
     void on_newfileButton_pressed();
 
@@ -103,7 +90,7 @@ public slots:
 
     void selectPreviousItem();
 
-    void onLineEditReturnPressed();
+    void showBarcodeEditor(const BarcodeViewModel& vm);
 
 protected:
     // 重写事件过滤器
@@ -122,8 +109,6 @@ private slots:
 
     void addDateItem();
 
-    void showBarcodeEditor(bool restoreVM = true);
-
     void onBtnArrowClicked();
 
     // 复制
@@ -149,39 +134,23 @@ private:
      */
     void moveSelectedItem(Qt::Key key);
 
-    // 加载图标（保留原功能）
-    QPixmap loadIcon(const QString& iconName, const QSize& size = QSize(40, 40));
-
-    PicScene *pPicScene;   //保存Item的Html
+    PicScene *pPicScene = nullptr;   //保存Item的Html
     //  PicScene *pPicScene2;  // 保存Item的Html对应的图片  解决场景模式文本无法放大的问题
-    QGraphicsView *view;
-    QGraphicsView *pViewer;
-    PicTextItem *textItem;
-    PicTextItem *textItem2;
-
-    PicCodeItem *codeItem_Operation = nullptr;
-
-    // 修改条形码和二维码的标志
-    bool editCodeFlag = false;
+    QGraphicsView *pViewer = nullptr;
+    PicTextItem *textItem = nullptr;
 
     PrintSetting* m_printSetting = nullptr;
 
+    PrintSettingModel m_printSettingModel;
+
     QString xmlfileName;
     DialogSaveFile *dialogSaveFile;
-    DialogFileOperation *dialogFileOperation;
 
     ImageLoader *imageLoader = nullptr;
     ItemEditor * itemEditor = nullptr;
     BarcodeEditor m_barcodeEditor;
 
     int editMode;
-    bool m_CreateImageFlag;
-    QGraphicsScene *m_pSavePicScene;
-
-    // 条形码和二维码的选择界面
-    void initSelecteCodeDlg();
-    // 在界面添加显示条形码和二维码的场景
-    void addCodeItem(QString str);
     //寻找当前选中的图层，没有选中的就不继续处理
     int checkSelectScene();
 
@@ -211,9 +180,8 @@ private:
     void selectItemByDirection(bool forward);
 
 signals:
-    void sig_stopPrint();
+
     void sendButtonClickedSignal(int index);
-    void sendUpdateFontSignl(int);
 
     void sig_showEditCounter(CounterViewModel viewModel);
 
@@ -223,7 +191,9 @@ signals:
     void sig_showScheduleShiftsEditor(QVector<ScheduleModel> schedules, TextItemModel txtModel);
 
     // 点击确定后，更新打印内容
-    void sig_updatePrintContent();
+    void sig_updatePrintContent(const QString& filename);
+
+    void sig_currentFileChanged();
 };
 
 #endif // TESTPRINTWIDGET_H