Merge branch 'Plugin_update' of git.oschina.net:kong__mo/fmp_printer into Plugin_update

fmp_printer_def.h

@@ -12,17 +12,6 @@
 #define FMP_INIKEY_PRINTERNET       "Printer/ip"
 #define FMP_INIKEY_PRINTERLABEL     "Printer/PrintLabel"
 #define FMP_INIKEY_LOGDAYS          "Printer/LogDays"
-
-#define FMP_INIKEY_PRINTERNAME_TIME      "Printertime/Name"
-#define FMP_INIKEY_PRINTERTYPE_TIME      "Printertime/Mode"
-#define FMP_INIKEY_PRINTERTYPET_TIME     "Printertime/PrintType"
-#define FMP_INIKEY_PRINTERSIZE_TIME      "Printertime/PaperWidth"
-#define FMP_INIKEY_PRINTERLEVLEL_TIME    "Printertime/Levlel"
-#define FMP_INIKEY_PRINTERTYPE2_TIME     "Printertime/Type"
-#define FMP_INIKEY_PRINTERUSB_TIME       "Printertime/usb"
-#define FMP_INIKEY_PRINTERPARALL_TIME    "Printertime/parallel"
-#define FMP_INIKEY_PRINTERNET_TIME       "Printertime/ip"
-#define FMP_INIKEY_PRINTERLABEL_TIME     "Printertime/PrintLabel"
-#define FMP_INIKEY_LOGDAYS_TIME          "Printertime/LogDays"
+#define FMP_INIKEY_PRINTERTIME      "Printer/printerTime"
 
 #endif // FMP_PRINTER_DEF_H

fmp_printer_p.h

@@ -12,13 +12,13 @@ typedef struct
     QString m_parall; //并口名字
     QString m_Usb;// usb的名字
     QString m_level; //日志的级别设定 默认
-    QString m_Ip ;
+    QString m_Ip[8] ;
     QString m_printerLabel;
     int m_PrintType;    //打印的某种样式
     int m_PrintSize;    //打印的纸张设定
-    int type;
+    int type[8];        //打印端口类型
     int m_nDays;          //删除日志的天数
-
+    int m_printerTime;    //几台设备打印
 
 } PrintClass,*pPrintclass;
 class FMPPrinterPrivate:public QObject
@@ -34,11 +34,11 @@ private:
     bool _DoPrint(QString data,QString strLabel);
     QString _GetPrintName();
     bool GetInfo(QString &printername,QString data);
-    QString SendIniData();
+    QString SendIniData(int times);
     QString SendIniDataTime();
 public:
     FMPPrinter         *q_ptr;
-    PrintClass        m_print,m_print_time;
+    PrintClass        m_print;
 
 private:
     FMPSettingsInterface*  settings;