neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #4136

Browse Source 
01ce711 [Qt] fix Qt slot problem in receivecoinsdialog (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-05-09 11:57:58 +02:00
commit da257a7b36
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qt/receivecoinsdialog.cpp
View File

@ -5,21 +5,21 @@
#include "receivecoinsdialog.h" #include "receivecoinsdialog.h"
#include "ui_receivecoinsdialog.h" #include "ui_receivecoinsdialog.h"
#include "walletmodel.h"
#include "bitcoinunits.h"
#include "addressbookpage.h" #include "addressbookpage.h"
#include "optionsmodel.h"
#include "guiutil.h"
#include "receiverequestdialog.h"
#include "addresstablemodel.h" #include "addresstablemodel.h"
#include "bitcoinunits.h"
#include "guiutil.h"
#include "optionsmodel.h"
#include "receiverequestdialog.h"
#include "recentrequeststablemodel.h" #include "recentrequeststablemodel.h"
#include "walletmodel.h"
#include <QAction> #include <QAction>
#include <QCursor> #include <QCursor>
#include <QMessageBox>
#include <QTextDocument>
#include <QScrollBar>
#include <QItemSelection> #include <QItemSelection>
#include <QMessageBox>
#include <QScrollBar>
#include <QTextDocument>
ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) : ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
@ -78,7 +78,7 @@ void ReceiveCoinsDialog::setModel(WalletModel *model)
connect(tableView->selectionModel(), connect(tableView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this,
SLOT(on_recentRequestsView_selectionChanged(QItemSelection, QItemSelection))); SLOT(recentRequestsView_selectionChanged(QItemSelection, QItemSelection)));
// Last 2 columns are set by the columnResizingFixer, when the table geometry is ready. // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH); columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH);
} }
@ -165,8 +165,7 @@ void ReceiveCoinsDialog::on_recentRequestsView_doubleClicked(const QModelIndex &
dialog->show(); dialog->show();
} }
void ReceiveCoinsDialog::on_recentRequestsView_selectionChanged(const QItemSelection &selected, void ReceiveCoinsDialog::recentRequestsView_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
const QItemSelection &deselected)
{ {
// Enable Show/Remove buttons only if anything is selected. // Enable Show/Remove buttons only if anything is selected.
bool enable = !ui->recentRequestsView->selectionModel()->selectedRows().isEmpty(); bool enable = !ui->recentRequestsView->selectionModel()->selectedRows().isEmpty();
@ -200,7 +199,7 @@ void ReceiveCoinsDialog::on_removeRequestButton_clicked()
// We override the virtual resizeEvent of the QWidget to adjust tables column // We override the virtual resizeEvent of the QWidget to adjust tables column
// sizes as the tables width is proportional to the dialogs width. // sizes as the tables width is proportional to the dialogs width.
void ReceiveCoinsDialog::resizeEvent(QResizeEvent* event) void ReceiveCoinsDialog::resizeEvent(QResizeEvent *event)
{ {
QWidget::resizeEvent(event); QWidget::resizeEvent(event);
columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message); columnResizingFixer->stretchColumnWidth(RecentRequestsTableModel::Message);

8
src/qt/receivecoinsdialog.h
View File

@ -18,8 +18,8 @@
namespace Ui { namespace Ui {
class ReceiveCoinsDialog; class ReceiveCoinsDialog;
} }
class WalletModel;
class OptionsModel; class OptionsModel;
class WalletModel;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QModelIndex; class QModelIndex;
@ -57,16 +57,16 @@ private:
WalletModel *model; WalletModel *model;
QMenu *contextMenu; QMenu *contextMenu;
void copyColumnToClipboard(int column); void copyColumnToClipboard(int column);
virtual void resizeEvent(QResizeEvent* event); virtual void resizeEvent(QResizeEvent *event);
private slots: private slots:
void on_receiveButton_clicked(); void on_receiveButton_clicked();
void on_showRequestButton_clicked(); void on_showRequestButton_clicked();
void on_removeRequestButton_clicked(); void on_removeRequestButton_clicked();
void on_recentRequestsView_doubleClicked(const QModelIndex &index); void on_recentRequestsView_doubleClicked(const QModelIndex &index);
void on_recentRequestsView_selectionChanged(const QItemSelection &, const QItemSelection &); void recentRequestsView_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
void updateDisplayUnit(); void updateDisplayUnit();
void showMenu(const QPoint &); void showMenu(const QPoint &point);
void copyLabel(); void copyLabel();
void copyMessage(); void copyMessage();
void copyAmount(); void copyAmount();