From 747e08afa94ff12b667888a7a560962ab53d5a4e Mon Sep 17 00:00:00 2001
From: chenxy123 <xiaoyou.chen@hotmail.com>
Date: Sat, 16 Apr 2016 20:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0About=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=86=85=E5=AE=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |  1 +
 vn.trader/ctaAlgo/ctaBase.py |  6 +++---
 vn.trader/uiMainWindow.py    | 40 +++++++-----------------------------
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 61bade92..8b4c1ece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ Release/
 # 不想同步的
 *.local
 *.temp
+*.vt
 =======
 vn.ctp/build/*
 vn.lts/build/*
diff --git a/vn.trader/ctaAlgo/ctaBase.py b/vn.trader/ctaAlgo/ctaBase.py
index 56c058c1..ef2dbd59 100644
--- a/vn.trader/ctaAlgo/ctaBase.py
+++ b/vn.trader/ctaAlgo/ctaBase.py
@@ -29,9 +29,9 @@ STOPORDERPREFIX = 'CtaStopOrder.'
 
 # 数据库名称
 SETTING_DB_NAME = 'VnTrader_Setting_Db'
-TICK_DB_NAME = 'VtTrader_Tick_Db'
-DAILY_DB_NAME = 'VtTrader_Daily_Db'
-MINUTE_DB_NAME = 'VtTrader_1Min_Db'
+TICK_DB_NAME = 'VnTrader_Tick_Db'
+DAILY_DB_NAME = 'VnTrader_Daily_Db'
+MINUTE_DB_NAME = 'VnTrader_1Min_Db'
 
 
 # CTA引擎中涉及的数据类定义
diff --git a/vn.trader/uiMainWindow.py b/vn.trader/uiMainWindow.py
index d93457db..3578c7c6 100644
--- a/vn.trader/uiMainWindow.py
+++ b/vn.trader/uiMainWindow.py
@@ -238,10 +238,8 @@ class MainWindow(QtGui.QMainWindow):
     #----------------------------------------------------------------------
     def test(self):
         """测试按钮用的函数"""
-        api = self.mainEngine.gatewayDict['KSGOLD'].tdApi
-        api.reqID += 1
-        api.reqQryOrder({}, api.reqID)
-        #api.reqQryTrade({}, api.reqID)
+        # 有需要使用手动触发的测试函数可以写在这里
+        pass
 
     #----------------------------------------------------------------------
     def openAbout(self):
@@ -309,40 +307,16 @@ class AboutWidget(QtGui.QDialog):
     #----------------------------------------------------------------------
     def initUi(self):
         """"""
-        self.setWindowTitle(u'关于')
+        self.setWindowTitle(u'关于VnTrader')
 
         text = u"""
-            VnTrader
-
-            更新日期：2015/9/29
-
-            作者：用Python的交易员
+            Developed by traders, for traders.
 
             License：MIT
-
-            主页：vnpy.org
-
-            Github：github.com/vnpy/vnpy
-
-            QQ交流群：262656087
-
-
-
-
-            开发环境
-
-            操作系统：Windows 7 专业版 64位
-
-            Python发行版：Python 2.7.6 (Anaconda 1.9.2 Win-32)
-
-            CTP：vn.ctp  2015/6/1版
-
-            图形库：PyQt4 4.11.3 Py2.7-x32
-
-            事件驱动引擎：vn.event
-
-            开发环境：WingIDE 5.0.6
             
+            Website：www.vnpy.org
+
+            Github：www.github.com/vnpy/vnpy
             
             """