diff --git a/programs/full_web_node/BUILD.md b/programs/full_web_node/BUILD.md new file mode 100644 index 00000000..c5df057f --- /dev/null +++ b/programs/full_web_node/BUILD.md @@ -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 diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index 2ef88183..c5f63956 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -47,8 +47,7 @@ void BlockChain::start() startFuture = chainThread->async([this] { try { QSettings settings; - rpcEndpoint = settings.value( "rpc-endpoint", "127.0.0.1:8090" ).value(); - auto seed_node = settings.value( "seed-node", "104.236.51.238:2005" ).value().toStdString(); + rpcEndpoint = settings.value( "rpc-endpoint", "127.0.0.1:8091" ).value(); grapheneApp->register_plugin(); grapheneApp->register_plugin(); @@ -57,7 +56,6 @@ void BlockChain::start() idump((dataDir.toStdString())); boost::program_options::variables_map map; map.insert({"rpc-endpoint",boost::program_options::variable_value(rpcEndpoint.toStdString(), false)}); - map.insert({"seed-node",boost::program_options::variable_value(std::vector{(seed_node)}, false)}); grapheneApp->initialize(dataDir.toStdString(), map); grapheneApp->initialize_plugins(map); grapheneApp->startup(); diff --git a/programs/full_web_node/CMakeLists.txt b/programs/full_web_node/CMakeLists.txt index 123a2d4e..538ad0f6 100644 --- a/programs/full_web_node/CMakeLists.txt +++ b/programs/full_web_node/CMakeLists.txt @@ -42,7 +42,7 @@ qt5_add_resources(QML_QRC qml/qml.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_PACKAGE_NAME ${CPACK_BUNDLE_NAME} ) @@ -59,13 +59,14 @@ get_filename_component( QT_PATH ${Qt5Core_DIR}/../../../ ABSOLUTE ) 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_SOURCE_FILES_PROPERTIES( "${OSX_ICON_FILE}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) SET( MACOSX_BUNDLE_BUNDLE_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_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_LONG_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) SET( MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) diff --git a/programs/full_web_node/Info.plist.in b/programs/full_web_node/Info.plist.in new file mode 100644 index 00000000..08296d01 --- /dev/null +++ b/programs/full_web_node/Info.plist.in @@ -0,0 +1,4 @@ + NSPrincipleClass + NSApplication + NSHighResolutionCapable + True diff --git a/programs/full_web_node/images/bitshares.icns b/programs/full_web_node/images/bitshares.icns new file mode 100644 index 00000000..2b79175e Binary files /dev/null and b/programs/full_web_node/images/bitshares.icns differ diff --git a/programs/full_web_node/main.cpp b/programs/full_web_node/main.cpp index 648867a2..36d1485f 100644 --- a/programs/full_web_node/main.cpp +++ b/programs/full_web_node/main.cpp @@ -23,10 +23,10 @@ int main(int argc, char *argv[]) { fc::thread::current().set_name("main"); QGuiApplication app(argc, argv); - app.setApplicationName("GrapheneOct5"); + app.setApplicationName("BitShares 2"); app.setApplicationDisplayName(app.applicationName()); - app.setOrganizationDomain("cryptonomex.org"); - app.setOrganizationName("Cryptonomex, Inc."); + app.setOrganizationDomain("bitshares.org"); + app.setOrganizationName("BitShares"); QtWebEngine::initialize(); qmlRegisterType("Graphene.FullNode", 1, 0, "BlockChain"); diff --git a/programs/full_web_node/qml/main.qml b/programs/full_web_node/qml/main.qml index 24375246..7f3470a7 100644 --- a/programs/full_web_node/qml/main.qml +++ b/programs/full_web_node/qml/main.qml @@ -6,8 +6,8 @@ import Graphene.FullNode 1.0 Window { id: window - width: Screen.width / 2 - height: Screen.height / 2 + width: Screen.width *.75 + height: Screen.height *.75 visible: true BlockChain { diff --git a/programs/full_web_node/web/index.html b/programs/full_web_node/web/index.html index aebfb04a..6bdb533c 100644 --- a/programs/full_web_node/web/index.html +++ b/programs/full_web_node/web/index.html @@ -4,7 +4,7 @@ - Graphene UI + BitShares 2.0