aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-10-25 14:19:44 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-10-26 21:31:53 +0200
commit4751df0ca3a0408caf588d4303bb33590d5f58c0 (patch)
tree6a49e38dbd387ac50c83812445c299f9962f2846 /src
parente2130051778027c1120b90bf2975b933b2d02034 (diff)
[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
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoingui.cpp6
-rw-r--r--src/qt/bitcoingui.h5
-rw-r--r--src/qt/forms/receivecoinsdialog.ui5
-rw-r--r--src/qt/forms/receiverequestdialog.ui3
-rw-r--r--src/qt/forms/sendcoinsdialog.ui2
-rw-r--r--src/qt/sendcoinsdialog.cpp1
6 files changed, 5 insertions, 17 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index eadda586a0..2279d4fb4b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -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)
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()));
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 0394e2f84e..215bb6fa05 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -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:
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:
QSystemTrayIcon *trayIcon;
Notificator *notificator;
- TransactionView *transactionView;
RPCConsole *rpcConsole;
QMovie *syncIconMovie;
diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui
index e01a23b9c4..dbb19cff4d 100644
--- a/src/qt/forms/receivecoinsdialog.ui
+++ b/src/qt/forms/receivecoinsdialog.ui
@@ -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 @@
</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>
diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
index d7724ef915..c9cb3de69f 100644
--- a/src/qt/forms/receiverequestdialog.ui
+++ b/src/qt/forms/receiverequestdialog.ui
@@ -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">
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 2a00fc5455..67ea45d2fd 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -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>
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 3fd4a26e76..d574eb73f9 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -3,7 +3,6 @@
#include "walletmodel.h"
#include "bitcoinunits.h"
-#include "addressbookpage.h"
#include "optionsmodel.h"
#include "sendcoinsentry.h"
#include "guiutil.h"