Commit 1cfec17a by 刘帅

悦孚石化

parent 033784d4
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*.ilk *.ilk
*.exp *.exp
*.user *.user
*.user*
*.res *.res
*.pdb *.pdb
*.zip *.zip
...@@ -13,7 +14,7 @@ ...@@ -13,7 +14,7 @@
*/plugins/*.lib */plugins/*.lib
*/plugins/*.pdb */plugins/*.pdb
*/plugins/*.rc */plugins/*.rc
*/bin/*.exe bins/*.exe
*/bin/configuration/* */bin/configuration/*
*/res/resource.h */res/resource.h
*/res/MANIFEST.MF */res/MANIFEST.MF
......
...@@ -15,7 +15,7 @@ SUBDIRS += fmp_manager \ ...@@ -15,7 +15,7 @@ SUBDIRS += fmp_manager \
FreemudPOS \ FreemudPOS \
FreemudSyncer \ FreemudSyncer \
fmp_redeem \ fmp_redeem \
fmp_coupon \ # fmp_coupon \
fmp_keyboard \ fmp_keyboard \
CONFIG += ordered CONFIG += ordered
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 83 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.keyboard\0" #define RES_FILE_DESC "fmp.keyboard\0"
#define RES_INTER_NAME "fmp.keyboard\0" #define RES_INTER_NAME "fmp.keyboard\0"
#define RES_FILE_NAME "fmp.keyboard\0" #define RES_FILE_NAME "fmp.keyboard\0"
......
Plugin-SymbolicName: fmp.logger Plugin-SymbolicName: fmp.logger
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.logger Plugin-Name: fmp.logger
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2019
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 65 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.logger\0" #define RES_FILE_DESC "fmp.logger\0"
#define RES_INTER_NAME "fmp.logger\0" #define RES_INTER_NAME "fmp.logger\0"
#define RES_FILE_NAME "fmp.logger\0" #define RES_FILE_NAME "fmp.logger\0"
......
Plugin-SymbolicName: fmp.manager Plugin-SymbolicName: fmp.manager
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.manager Plugin-Name: fmp.manager
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2019
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 65 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.manager\0" #define RES_FILE_DESC "fmp.manager\0"
#define RES_INTER_NAME "fmp.manager\0" #define RES_INTER_NAME "fmp.manager\0"
#define RES_FILE_NAME "fmp.manager\0" #define RES_FILE_NAME "fmp.manager\0"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 65 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.network\0" #define RES_FILE_DESC "fmp.network\0"
#define RES_INTER_NAME "fmp.network\0" #define RES_INTER_NAME "fmp.network\0"
#define RES_FILE_NAME "fmp.network\0" #define RES_FILE_NAME "fmp.network\0"
......
fmp_printer @ 5ed17460
Subproject commit 4594503af57e9d86b8c64d2f1e0eb4ea87d174fd Subproject commit 5ed1746021fda410a70c8f20961b2cb5bea80bcd
fmp_redeem/res/img/bg_be_invalid.png

7.29 KB | W: | H:

fmp_redeem/res/img/bg_be_invalid.png

3.87 KB | W: | H:

fmp_redeem/res/img/bg_be_invalid.png
fmp_redeem/res/img/bg_be_invalid.png
fmp_redeem/res/img/bg_be_invalid.png
fmp_redeem/res/img/bg_be_invalid.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_exchange.png

13.6 KB | W: | H:

fmp_redeem/res/img/bg_exchange.png

8.44 KB | W: | H:

fmp_redeem/res/img/bg_exchange.png
fmp_redeem/res/img/bg_exchange.png
fmp_redeem/res/img/bg_exchange.png
fmp_redeem/res/img/bg_exchange.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_invalid_code.png

11.4 KB | W: | H:

fmp_redeem/res/img/bg_invalid_code.png

10.8 KB | W: | H:

fmp_redeem/res/img/bg_invalid_code.png
fmp_redeem/res/img/bg_invalid_code.png
fmp_redeem/res/img/bg_invalid_code.png
fmp_redeem/res/img/bg_invalid_code.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_no_exchange.png

13.7 KB | W: | H:

fmp_redeem/res/img/bg_no_exchange.png

8.37 KB | W: | H:

fmp_redeem/res/img/bg_no_exchange.png
fmp_redeem/res/img/bg_no_exchange.png
fmp_redeem/res/img/bg_no_exchange.png
fmp_redeem/res/img/bg_no_exchange.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_sanning.png

36.9 KB | W: | H:

fmp_redeem/res/img/bg_sanning.png

51 KB | W: | H:

fmp_redeem/res/img/bg_sanning.png
fmp_redeem/res/img/bg_sanning.png
fmp_redeem/res/img/bg_sanning.png
fmp_redeem/res/img/bg_sanning.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_waiting.png

31.5 KB | W: | H:

fmp_redeem/res/img/bg_waiting.png

8.37 KB | W: | H:

fmp_redeem/res/img/bg_waiting.png
fmp_redeem/res/img/bg_waiting.png
fmp_redeem/res/img/bg_waiting.png
fmp_redeem/res/img/bg_waiting.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/bg_working.png

32.2 KB | W: | H:

fmp_redeem/res/img/bg_working.png

26.3 KB | W: | H:

fmp_redeem/res/img/bg_working.png
fmp_redeem/res/img/bg_working.png
fmp_redeem/res/img/bg_working.png
fmp_redeem/res/img/bg_working.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/btn_consumption.png

19.5 KB | W: | H:

fmp_redeem/res/img/btn_consumption.png

4.98 KB | W: | H:

fmp_redeem/res/img/btn_consumption.png
fmp_redeem/res/img/btn_consumption.png
fmp_redeem/res/img/btn_consumption.png
fmp_redeem/res/img/btn_consumption.png
  • 2-up
  • Swipe
  • Onion skin
fmp_redeem/res/img/consumption_ok.png

20.6 KB | W: | H:

fmp_redeem/res/img/consumption_ok.png

5.79 KB | W: | H:

fmp_redeem/res/img/consumption_ok.png
fmp_redeem/res/img/consumption_ok.png
fmp_redeem/res/img/consumption_ok.png
fmp_redeem/res/img/consumption_ok.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 92 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.redeem\0" #define RES_FILE_DESC "fmp.redeem\0"
#define RES_INTER_NAME "fmp.redeem\0" #define RES_INTER_NAME "fmp.redeem\0"
#define RES_FILE_NAME "fmp.redeem\0" #define RES_FILE_NAME "fmp.redeem\0"
......
Plugin-SymbolicName: fmp.syncer Plugin-SymbolicName: fmp.syncer
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.syncer Plugin-Name: fmp.syncer
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2019
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 65 #define VER_BUILD 95
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.syncer\0" #define RES_FILE_DESC "fmp.syncer\0"
#define RES_INTER_NAME "fmp.syncer\0" #define RES_INTER_NAME "fmp.syncer\0"
#define RES_FILE_NAME "fmp.syncer\0" #define RES_FILE_NAME "fmp.syncer\0"
......
...@@ -57,7 +57,7 @@ Entryurl= ...@@ -57,7 +57,7 @@ Entryurl=
Entryport= Entryport=
[Printer] [Printer]
Name=Send To OneNote 2016 Name=\x53d1\x9001\x81f3 OneNote 16
Mode=2 Mode=2
PaperWidth=80 PaperWidth=80
type=4 type=4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment