[GUI] Remove datadir argument, set app metadata

This commit is contained in:
Nathan Hourt 2015-07-13 14:35:17 -04:00
parent bca5eb1fc9
commit 8108360a1b
4 changed files with 11 additions and 7 deletions

View file

@ -38,8 +38,6 @@ GrapheneApplication::GrapheneApplication( QObject* parent )
this, &GrapheneApplication::execute ); this, &GrapheneApplication::execute );
m_model = new ChainDataModel( m_thread, this ); m_model = new ChainDataModel( m_thread, this );
start( "", "", "", "" );
} }
GrapheneApplication::~GrapheneApplication() 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() ) 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; return;
} }
try { try {

View file

@ -93,9 +93,8 @@ public:
return m_model; return m_model;
} }
Q_INVOKABLE void start( QString dataDirectory, Q_INVOKABLE void start(QString apiUrl,
QString apiUrl, QString user,
QString user,
QString pass ); QString pass );
bool isConnected() const bool isConnected() const

View file

@ -9,6 +9,9 @@ int main(int argc, char *argv[])
{ {
fc::thread::current().set_name( "main" ); fc::thread::current().set_name( "main" );
QApplication app(argc, argv); QApplication app(argc, argv);
app.setApplicationName("Graphene Client");
app.setOrganizationDomain("cryptonomex.org");
app.setOrganizationName("Cryptonomex, Inc.");
qRegisterMetaType<std::function<void()>>(); qRegisterMetaType<std::function<void()>>();

View file

@ -13,6 +13,10 @@ ApplicationWindow {
height: 480 height: 480
title: qsTr("Hello World") title: qsTr("Hello World")
Component.onCompleted: {
app.start("ws://localhost:8090", "user", "pass")
}
menuBar: MenuBar { menuBar: MenuBar {
Menu { Menu {
title: qsTr("File") title: qsTr("File")