Skip to content

Commit d93b287

Browse files
committed
v1.2 Released!
Added OkCoin.cn exchange Synced symbols for supported exchanges Added BTC-e exchange mirror domain Fixed time sync bug that caused API keys corruption Fixed script language bugs Fixed bug when last trade signal not worked Auto update engine updated, version signature added Many bugs fixed, many improvements
1 parent 231510b commit d93b287

235 files changed

Lines changed: 3643 additions & 1093 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/QtBitcoinTrader.plist

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleVersion</key>
6+
<string>1.20.00</string>
7+
<key>CFBundleName</key>
8+
<string>Qt Bitcoin Trader</string>
9+
<key>CFBundleIconFile</key>
10+
<string>QtBitcoinTrader</string>
11+
<key>CFBundlePackageType</key>
12+
<string>APPL</string>
13+
<key>CFBundleGetInfoString</key>
14+
<string>Developed by July IGHOR. Centrabit AG</string>
15+
<key>CFBundleSignature</key>
16+
<string>QTBT</string>
17+
<key>CFBundleExecutable</key>
18+
<string>QtBitcoinTrader</string>
19+
<key>CFBundleIdentifier</key>
20+
<string>com.centrabit.QtBitcoinTrader</string>
21+
<key>NSPrincipalClass</key>
22+
<string>NSApplication</string>
23+
<key>NSHighResolutionCapable</key>
24+
<string>True</string>
25+
</dict>
26+
</plist>

src/QtBitcoinTrader_Desktop.pro

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
equals(QT_MAJOR_VERSION, 4): {
2-
error("Qt 4 is no longer supported. In order to compile Qt Bitcoin Trader you need update to Qt 5 and C++11");
1+
lessThan(QT_VERSION, 5.5): {
2+
error("Qt less than 5.5 is no longer supported. In order to compile Qt Bitcoin Trader you need update to Qt 5.5 and C++11");
33
}
44

5+
QMAKE_MAC_SDK = macosx10.11
56
QMAKE_CFLAGS_WARN_ON += -Wno-deprecated-declarations -Wno-unused-function
67
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations -Wno-unused-function
78

@@ -12,19 +13,20 @@ INCLUDEPATH += .
1213
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
1314

1415

15-
CONFIG += qt release
16+
CONFIG += qt # release
1617
CONFIG += c++11
1718

1819
win32 { TARGET = ../Bin/QtBitcoinTrader }
1920
!win32 { TARGET = QtBitcoinTrader }
2021

21-
QT += network script
22-
greaterThan(QT_MAJOR_VERSION, 4): {
23-
QT += widgets
22+
QT += network script widgets
2423
!win32 { QT += multimedia }
25-
}
2624

27-
exists("sapi.h"){ DEFINES += SAPI_ENABLED }
25+
#exists("sapi.h"){ DEFINES += SAPI_ENABLED }
26+
exists($$(WINDOWSSDKDIR)/Include/sapi.h){
27+
DEFINES += SAPI_ENABLED
28+
#win32 { !CONFIG(static) { LIBS += -lole32 } }
29+
}
2830

2931
CONFIG(static) {
3032
greaterThan(QT_MAJOR_VERSION, 4): {
@@ -40,7 +42,7 @@ CONFIG(static) {
4042
QTPLUGIN.designer=-
4143
QTPLUGIN.iconengines=-
4244
QTPLUGIN.imageformats=-
43-
win32 { DEFINES += STATIC_QT5_BUILD }
45+
#win32 { DEFINES += STATIC_QT5_BUILD }
4446
}
4547
}
4648

@@ -116,22 +118,25 @@ HEADERS += aboutdialog.h \
116118
julymath.h \
117119
exchange_bitcurex.h \
118120
exchange_bitmarket.h \
121+
exchange_okcoin.h \
119122
platform/sound.h \
120123
platform/socket.h \
121124
config/config_manager.h \
122125
config/config_manager_dialog.h \
123126
utils/utils.h \
124127
dock/dock_host.h \
125-
chartsview.h \
126-
chartsmodel.h \
128+
charts/chartsview.h \
129+
charts/chartsmodel.h \
127130
settingsdialog.h \
128131
settingsgeneral.h \
129132
settingsnetworkproxy.h \
130133
settingsdialoglistelement.h \
131134
settingsdecimals.h \
132135
timesync.h \
133136
translationmessage.h \
134-
indicatorengine.h
137+
indicatorengine.h \
138+
news/newsview.h \
139+
news/newsmodel.h
135140

136141
FORMS += addrulegroup.ui \
137142
datafolderchusedialog.ui \
@@ -155,13 +160,14 @@ FORMS += addrulegroup.ui \
155160
exchangebutton.ui \
156161
addruledialog.ui \
157162
config/config_manager_dialog.ui \
158-
chartsview.ui \
163+
charts/chartsview.ui \
159164
settingsdialog.ui \
160165
settingsgeneral.ui \
161166
settingsnetworkproxy.ui \
162167
settingsdialoglistelement.ui \
163168
settingsdecimals.ui \
164-
translationmessage.ui
169+
translationmessage.ui \
170+
news/newsview.ui
165171

166172
SOURCES += aboutdialog.cpp \
167173
addrulegroup.cpp \
@@ -222,22 +228,25 @@ SOURCES += aboutdialog.cpp \
222228
exchange_indacoin.cpp \
223229
exchange_bitcurex.cpp \
224230
exchange_bitmarket.cpp \
231+
exchange_okcoin.cpp \
225232
platform/sound.cpp \
226233
platform/socket.cpp \
227234
config/config_manager.cpp \
228235
config/config_manager_dialog.cpp \
229236
utils/utils.cpp \
230237
dock/dock_host.cpp \
231-
chartsview.cpp \
232-
chartsmodel.cpp \
238+
charts/chartsview.cpp \
239+
charts/chartsmodel.cpp \
233240
settingsdialog.cpp \
234241
settingsgeneral.cpp \
235242
settingsnetworkproxy.cpp \
236243
settingsdialoglistelement.cpp \
237244
settingsdecimals.cpp \
238245
timesync.cpp \
239246
translationmessage.cpp \
240-
indicatorengine.cpp
247+
indicatorengine.cpp \
248+
news/newsview.cpp \
249+
news/newsmodel.cpp
241250

242251
#
243252
# Resources
@@ -281,3 +290,4 @@ RC_FILE = WinResource.rc
281290
}
282291

283292
macx:ICON = $${PWD}/QtBitcoinTrader.icns
293+
macx:QMAKE_INFO_PLIST = $${PWD}/QtBitcoinTrader.plist

src/QtResource.qrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,11 @@
106106
<file>Resources/settings_global_32x32.png</file>
107107
<file>Resources/settings_network_32x32.png</file>
108108
<file>Resources/settings_decimals_32x32.png</file>
109+
<file>Resources/Exchanges/Logos/OKCoin.png</file>
110+
<file>Resources/Exchanges/Logos/OKCoin_Big.png</file>
111+
<file>Resources/Exchanges/OKCoin.ini</file>
112+
<file>Resources/Language/Japanese.lng</file>
113+
<file>Resources/CurrencySign/DSH.png</file>
114+
<file>Resources/CurrencySign/ETH.png</file>
109115
</qresource>
110116
</RCC>

src/Resources/CertBase.cer

-3.47 KB
Binary file not shown.

src/Resources/Currencies.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,16 @@ SignNonUTF8=D
172172
ValueStep=0.01
173173
ValueSmall=3.0
174174

175+
[DSH]
176+
Name=Dash
177+
Sign=Dash
178+
SignNonUTF8=Dash
179+
ValueStep=0.01
180+
ValueSmall=2.0
181+
182+
[ETH]
183+
Name=Ethereum
184+
Sign=Eth
185+
SignNonUTF8=Eth
186+
ValueStep=0.01
187+
ValueSmall=2.0

src/Resources/CurrencySign/AUD.png

11.5 KB
Loading

src/Resources/CurrencySign/BTC.png

11.5 KB
Loading

src/Resources/CurrencySign/CAD.png

11.5 KB
Loading

src/Resources/CurrencySign/CHF.png

-2.53 KB
Loading

src/Resources/CurrencySign/CNY.png

11.5 KB
Loading

0 commit comments

Comments
 (0)