From 8108360a1b1623ea5fbdd8554d23aff7bb6cc59a Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 13 Jul 2015 14:35:17 -0400 Subject: [PATCH] [GUI] Remove datadir argument, set app metadata --- programs/light_client/ClientDataModel.cpp | 6 ++---- programs/light_client/ClientDataModel.hpp | 5 ++--- programs/light_client/main.cpp | 3 +++ programs/light_client/qml/main.qml | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index f878de66..f40f9b6d 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -38,8 +38,6 @@ GrapheneApplication::GrapheneApplication( QObject* parent ) this, &GrapheneApplication::execute ); m_model = new ChainDataModel( m_thread, this ); - - start( "", "", "", "" ); } GrapheneApplication::~GrapheneApplication() @@ -55,11 +53,11 @@ void GrapheneApplication::setIsConnected( bool v ) } } -void GrapheneApplication::start( QString datadir, QString apiurl, QString user, QString pass ) +void GrapheneApplication::start( QString apiurl, QString user, QString pass ) { if( !m_thread.is_current() ) { - m_done = m_thread.async( [=](){ return start( datadir, apiurl, user, pass ); } ); + m_done = m_thread.async( [=](){ return start( apiurl, user, pass ); } ); return; } try { diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index c4f0f8cd..95ecf6e8 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -93,9 +93,8 @@ public: return m_model; } - Q_INVOKABLE void start( QString dataDirectory, - QString apiUrl, - QString user, + Q_INVOKABLE void start(QString apiUrl, + QString user, QString pass ); bool isConnected() const diff --git a/programs/light_client/main.cpp b/programs/light_client/main.cpp index 3d7f16ef..ccd7a600 100644 --- a/programs/light_client/main.cpp +++ b/programs/light_client/main.cpp @@ -9,6 +9,9 @@ int main(int argc, char *argv[]) { fc::thread::current().set_name( "main" ); QApplication app(argc, argv); + app.setApplicationName("Graphene Client"); + app.setOrganizationDomain("cryptonomex.org"); + app.setOrganizationName("Cryptonomex, Inc."); qRegisterMetaType>(); diff --git a/programs/light_client/qml/main.qml b/programs/light_client/qml/main.qml index 0db0575d..a07764ba 100644 --- a/programs/light_client/qml/main.qml +++ b/programs/light_client/qml/main.qml @@ -13,6 +13,10 @@ ApplicationWindow { height: 480 title: qsTr("Hello World") + Component.onCompleted: { + app.start("ws://localhost:8090", "user", "pass") + } + menuBar: MenuBar { Menu { title: qsTr("File")