Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Update full web node for release

Browse source
This commit is contained in:
Daniel Larimer 2015-10-13 13:22:24 -04:00
parent a4d87ec8c7
commit f2b0a6d959
8 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
programs/full_web_node/BUILD.md Normal file
View file

@ -0,0 +1,2 @@
cd ${HOME}/Qt/5.5/clang_64/bin
./macdeployqt ${FULL_PATH}/full_web_node/BitShares\ 2.app -dmg -qmldir=${FULL_PATH}/full_web_node/qml

4
programs/full_web_node/BlockChain.cpp
View file

@ -47,8 +47,7 @@ void BlockChain::start()
startFuture = chainThread->async([this] { startFuture = chainThread->async([this] {
try { try {
QSettings settings; QSettings settings;
rpcEndpoint = settings.value( "rpc-endpoint", "127.0.0.1:8090" ).value<QString>(); rpcEndpoint = settings.value( "rpc-endpoint", "127.0.0.1:8091" ).value<QString>();
auto seed_node = settings.value( "seed-node", "104.236.51.238:2005" ).value<QString>().toStdString();
grapheneApp->register_plugin<graphene::account_history::account_history_plugin>(); grapheneApp->register_plugin<graphene::account_history::account_history_plugin>();
grapheneApp->register_plugin<graphene::market_history::market_history_plugin>(); grapheneApp->register_plugin<graphene::market_history::market_history_plugin>();
@ -57,7 +56,6 @@ void BlockChain::start()
idump((dataDir.toStdString())); idump((dataDir.toStdString()));
boost::program_options::variables_map map; boost::program_options::variables_map map;
map.insert({"rpc-endpoint",boost::program_options::variable_value(rpcEndpoint.toStdString(), false)}); map.insert({"rpc-endpoint",boost::program_options::variable_value(rpcEndpoint.toStdString(), false)});
map.insert({"seed-node",boost::program_options::variable_value(std::vector<std::string>{(seed_node)}, false)});
grapheneApp->initialize(dataDir.toStdString(), map); grapheneApp->initialize(dataDir.toStdString(), map);
grapheneApp->initialize_plugins(map); grapheneApp->initialize_plugins(map);
grapheneApp->startup(); grapheneApp->startup();

7
programs/full_web_node/CMakeLists.txt
View file

@ -42,7 +42,7 @@ qt5_add_resources(QML_QRC qml/qml.qrc)
qt5_add_resources(WEB_QRC web/web.qrc) qt5_add_resources(WEB_QRC web/web.qrc)
set( APP_NAME "GrapheneOct5" ) set( APP_NAME "BitShares 2" )
set( CPACK_BUNDLE_NAME ${APP_NAME} ) set( CPACK_BUNDLE_NAME ${APP_NAME} )
set( CPACK_PACKAGE_NAME ${CPACK_BUNDLE_NAME} ) set( CPACK_PACKAGE_NAME ${CPACK_BUNDLE_NAME} )
@ -59,13 +59,14 @@ get_filename_component( QT_PATH ${Qt5Core_DIR}/../../../ ABSOLUTE )
IF( APPLE ) IF( APPLE )
set( MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in" )
set ( OSX_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/images/bitshares.icns" ) set ( OSX_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/images/bitshares.icns" )
SET_SOURCE_FILES_PROPERTIES( "${OSX_ICON_FILE}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) SET_SOURCE_FILES_PROPERTIES( "${OSX_ICON_FILE}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
SET( MACOSX_BUNDLE_BUNDLE_NAME ${CPACK_BUNDLE_NAME} ) SET( MACOSX_BUNDLE_BUNDLE_NAME ${CPACK_BUNDLE_NAME} )
SET( MACOSX_BUNDLE_EXECUTABLE_NAME ${CPACK_BUNDLE_NAME} ) SET( MACOSX_BUNDLE_EXECUTABLE_NAME ${CPACK_BUNDLE_NAME} )
SET( MACOSX_BUNDLE_GUI_IDENTIFIER "org.cryptonomex.${CPACK_BUNDLE_NAME}" ) SET( MACOSX_BUNDLE_GUI_IDENTIFIER "org.bitshares.${CPACK_BUNDLE_NAME}" )
SET( MACOSX_BUNDLE_ICON_FILE "bitshares.icns" ) SET( MACOSX_BUNDLE_ICON_FILE "bitshares.icns" )
SET( MACOSX_BUNDLE_INFO_STRING "Graphene v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( MACOSX_BUNDLE_INFO_STRING "BitShares v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
SET( MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
SET( MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
SET( MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )

4
programs/full_web_node/Info.plist.in Normal file
View file

@ -0,0 +1,4 @@
<key>NSPrincipleClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>

BIN
programs/full_web_node/images/bitshares.icns Normal file
View file

Binary file not shown.

6
programs/full_web_node/main.cpp
View file

@ -23,10 +23,10 @@ int main(int argc, char *argv[])
{ {
fc::thread::current().set_name("main"); fc::thread::current().set_name("main");
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
app.setApplicationName("GrapheneOct5"); app.setApplicationName("BitShares 2");
app.setApplicationDisplayName(app.applicationName()); app.setApplicationDisplayName(app.applicationName());
app.setOrganizationDomain("cryptonomex.org"); app.setOrganizationDomain("bitshares.org");
app.setOrganizationName("Cryptonomex, Inc."); app.setOrganizationName("BitShares");
QtWebEngine::initialize(); QtWebEngine::initialize();
qmlRegisterType<BlockChain>("Graphene.FullNode", 1, 0, "BlockChain"); qmlRegisterType<BlockChain>("Graphene.FullNode", 1, 0, "BlockChain");

4
programs/full_web_node/qml/main.qml
View file

@ -6,8 +6,8 @@ import Graphene.FullNode 1.0
Window { Window {
id: window id: window
width: Screen.width / 2 width: Screen.width *.75
height: Screen.height / 2 height: Screen.height *.75
visible: true visible: true
BlockChain { BlockChain {

2
programs/full_web_node/web/index.html
View file

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width"/> <meta name="viewport" content="width=device-width"/>
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>--> <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>-->
<title>Graphene UI</title> <title>BitShares 2.0</title>
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<style> <style>
body {background-color: #2a2a2a} body {background-color: #2a2a2a}