Browse Source

[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
pull/1/head
Philip Kaufmann 9 years ago
parent
commit
4751df0ca3
  1. 6
      src/qt/bitcoingui.cpp
  2. 5
      src/qt/bitcoingui.h
  3. 5
      src/qt/forms/receivecoinsdialog.ui
  4. 3
      src/qt/forms/receiverequestdialog.ui
  5. 2
      src/qt/forms/sendcoinsdialog.ui
  6. 1
      src/qt/sendcoinsdialog.cpp

6
src/qt/bitcoingui.cpp

@ -7,14 +7,12 @@ @@ -7,14 +7,12 @@
#include "bitcoingui.h"
#include "transactiontablemodel.h"
#include "optionsdialog.h"
#include "aboutdialog.h"
#include "clientmodel.h"
#include "walletmodel.h"
#include "walletframe.h"
#include "optionsmodel.h"
#include "transactiondescdialog.h"
#include "bitcoinunits.h"
#include "guiconstants.h"
#include "notificator.h"
@ -258,9 +256,9 @@ void BitcoinGUI::createActions(bool fIsTestnet) @@ -258,9 +256,9 @@ void BitcoinGUI::createActions(bool fIsTestnet)
openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
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->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(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));

5
src/qt/bitcoingui.h

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

5
src/qt/forms/receivecoinsdialog.ui

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

3
src/qt/forms/receiverequestdialog.ui

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

2
src/qt/forms/sendcoinsdialog.ui

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

1
src/qt/sendcoinsdialog.cpp

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

Loading…
Cancel
Save