[Qt] additional small fixes for #3099 (new receive flow)

- remove 2 unneeded windowTitle attributes, which bloat our translations
- cleanup some unneeded .cpp/.h includes and class usages
- use a more generic string for clearing sendcoinsdialog and
  requestpaymentdialog
- edit 2 strings in BitcoinGUI and replace "edit" with "show" as this
  seems more clear in the context where it is used
This commit is contained in:
Philip Kaufmann 2013-10-25 14:19:44 +02:00
parent e213005177
commit 4751df0ca3
6 changed files with 5 additions and 17 deletions

View file

@ -7,14 +7,12 @@
#include "bitcoingui.h" #include "bitcoingui.h"
#include "transactiontablemodel.h"
#include "optionsdialog.h" #include "optionsdialog.h"
#include "aboutdialog.h" #include "aboutdialog.h"
#include "clientmodel.h" #include "clientmodel.h"
#include "walletmodel.h" #include "walletmodel.h"
#include "walletframe.h" #include "walletframe.h"
#include "optionsmodel.h" #include "optionsmodel.h"
#include "transactiondescdialog.h"
#include "bitcoinunits.h" #include "bitcoinunits.h"
#include "guiconstants.h" #include "guiconstants.h"
#include "notificator.h" #include "notificator.h"
@ -258,9 +256,9 @@ void BitcoinGUI::createActions(bool fIsTestnet)
openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console")); openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
usedSendingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("&Used sending addresses..."), this); usedSendingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("&Used sending addresses..."), this);
usedSendingAddressesAction->setStatusTip(tr("Edit the list of used sending addresses and labels")); usedSendingAddressesAction->setStatusTip(tr("Show the list of used sending addresses and labels"));
usedReceivingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("Used &receiving addresses..."), this); usedReceivingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("Used &receiving addresses..."), this);
usedReceivingAddressesAction->setStatusTip(tr("Edit the list of used receiving addresses and labels")); usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));

View file

@ -5,13 +5,11 @@
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QMap> #include <QMap>
class TransactionTableModel;
class WalletFrame; class WalletFrame;
class WalletView; class WalletView;
class ClientModel; class ClientModel;
class WalletModel; class WalletModel;
class WalletStack; class WalletStack;
class TransactionView;
class OverviewPage; class OverviewPage;
class SendCoinsDialog; class SendCoinsDialog;
class SendCoinsRecipient; class SendCoinsRecipient;
@ -50,11 +48,11 @@ public:
The client model represents the part of the core that communicates with the P2P network, and is wallet-agnostic. The client model represents the part of the core that communicates with the P2P network, and is wallet-agnostic.
*/ */
void setClientModel(ClientModel *clientModel); void setClientModel(ClientModel *clientModel);
/** Set the wallet model. /** Set the wallet model.
The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending The wallet model represents a bitcoin wallet, and offers access to the list of transactions, address book and sending
functionality. functionality.
*/ */
bool addWallet(const QString& name, WalletModel *walletModel); bool addWallet(const QString& name, WalletModel *walletModel);
bool setCurrentWallet(const QString& name); bool setCurrentWallet(const QString& name);
@ -98,7 +96,6 @@ private:
QSystemTrayIcon *trayIcon; QSystemTrayIcon *trayIcon;
Notificator *notificator; Notificator *notificator;
TransactionView *transactionView;
RPCConsole *rpcConsole; RPCConsole *rpcConsole;
QMovie *syncIconMovie; QMovie *syncIconMovie;

View file

@ -10,9 +10,6 @@
<height>343</height> <height>343</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -113,7 +110,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Remove all transaction fields</string> <string>Clear all fields of the form.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Clear</string> <string>Clear</string>

View file

@ -10,9 +10,6 @@
<height>597</height> <height>597</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Request coins</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QRImageWidget" name="lblQRCode"> <widget class="QRImageWidget" name="lblQRCode">

View file

@ -84,7 +84,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Remove all transaction fields</string> <string>Clear all fields of the form.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Clear &amp;All</string> <string>Clear &amp;All</string>

View file

@ -3,7 +3,6 @@
#include "walletmodel.h" #include "walletmodel.h"
#include "bitcoinunits.h" #include "bitcoinunits.h"
#include "addressbookpage.h"
#include "optionsmodel.h" #include "optionsmodel.h"
#include "sendcoinsentry.h" #include "sendcoinsentry.h"
#include "guiutil.h" #include "guiutil.h"