@ -10,12 +10,12 @@
# include "guiconstants.h"
# include "guiconstants.h"
# include "guiutil.h"
# include "guiutil.h"
# include "notificator.h"
# include "notificator.h"
# include "openuridialog.h"
# include "optionsdialog.h"
# include "optionsdialog.h"
# include "optionsmodel.h"
# include "optionsmodel.h"
# include "rpcconsole.h"
# include "rpcconsole.h"
# include "walletframe.h"
# include "walletframe.h"
# include "walletmodel.h"
# include "walletmodel.h"
# include "openuridialog.h"
# ifdef Q_OS_MAC
# ifdef Q_OS_MAC
# include "macdockiconhandler.h"
# include "macdockiconhandler.h"
@ -345,7 +345,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
setNumBlocks ( clientModel - > getNumBlocks ( ) , clientModel - > getNumBlocksOfPeers ( ) ) ;
setNumBlocks ( clientModel - > getNumBlocks ( ) , clientModel - > getNumBlocksOfPeers ( ) ) ;
connect ( clientModel , SIGNAL ( numBlocksChanged ( int , int ) ) , this , SLOT ( setNumBlocks ( int , int ) ) ) ;
connect ( clientModel , SIGNAL ( numBlocksChanged ( int , int ) ) , this , SLOT ( setNumBlocks ( int , int ) ) ) ;
// Receive and report messages from network/worker thread
// Receive and report messages from client model
connect ( clientModel , SIGNAL ( message ( QString , QString , unsigned int ) ) , this , SLOT ( message ( QString , QString , unsigned int ) ) ) ;
connect ( clientModel , SIGNAL ( message ( QString , QString , unsigned int ) ) , this , SLOT ( message ( QString , QString , unsigned int ) ) ) ;
rpcConsole - > setClientModel ( clientModel ) ;
rpcConsole - > setClientModel ( clientModel ) ;
@ -460,21 +460,25 @@ void BitcoinGUI::optionsClicked()
{
{
if ( ! clientModel | | ! clientModel - > getOptionsModel ( ) )
if ( ! clientModel | | ! clientModel - > getOptionsModel ( ) )
return ;
return ;
OptionsDialog dlg ;
OptionsDialog dlg ( this ) ;
dlg . setModel ( clientModel - > getOptionsModel ( ) ) ;
dlg . setModel ( clientModel - > getOptionsModel ( ) ) ;
dlg . exec ( ) ;
dlg . exec ( ) ;
}
}
void BitcoinGUI : : aboutClicked ( )
void BitcoinGUI : : aboutClicked ( )
{
{
AboutDialog dlg ;
if ( ! clientModel )
return ;
AboutDialog dlg ( this ) ;
dlg . setModel ( clientModel ) ;
dlg . setModel ( clientModel ) ;
dlg . exec ( ) ;
dlg . exec ( ) ;
}
}
void BitcoinGUI : : openClicked ( )
void BitcoinGUI : : openClicked ( )
{
{
OpenURIDialog dlg ;
OpenURIDialog dlg ( this ) ;
if ( dlg . exec ( ) )
if ( dlg . exec ( ) )
{
{
emit receivedURI ( dlg . getURI ( ) ) ;
emit receivedURI ( dlg . getURI ( ) ) ;