mirror of
				https://git.wownero.com/wowlet/wowlet.git
				synced 2024-08-15 01:03:14 +00:00 
			
		
		
		
	Merge pull request 'History, Coins, Xmr.to: double click row to open info dialog' (#49) from tobtoht/feather:history_double_click into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/49
This commit is contained in:
		
						commit
						d9eb521e9f
					
				
					 4 changed files with 22 additions and 6 deletions
				
			
		| 
						 | 
					@ -57,6 +57,7 @@ CoinsWidget::CoinsWidget(QWidget *parent)
 | 
				
			||||||
    connect(m_thawAllSelectedAction, &QAction::triggered, this, &CoinsWidget::thawAllSelected);
 | 
					    connect(m_thawAllSelectedAction, &QAction::triggered, this, &CoinsWidget::thawAllSelected);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    connect(ui->coins, &QTreeView::customContextMenuRequested, this, &CoinsWidget::showContextMenu);
 | 
					    connect(ui->coins, &QTreeView::customContextMenuRequested, this, &CoinsWidget::showContextMenu);
 | 
				
			||||||
 | 
					    connect(ui->coins, &QTreeView::doubleClicked, this, &CoinsWidget::viewOutput);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void CoinsWidget::setModel(CoinsModel * model, Coins * coins) {
 | 
					void CoinsWidget::setModel(CoinsModel * model, Coins * coins) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -35,6 +35,14 @@ HistoryWidget::HistoryWidget(QWidget *parent)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
    connect(ui->search, &QLineEdit::textChanged, this, &HistoryWidget::setSearchFilter);
 | 
					    connect(ui->search, &QLineEdit::textChanged, this, &HistoryWidget::setSearchFilter);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(ui->history, &QTreeView::doubleClicked, [this](QModelIndex index){
 | 
				
			||||||
 | 
					        if (m_model == nullptr) return;
 | 
				
			||||||
 | 
					        if (!(m_model->flags(index) & Qt::ItemIsEditable)) {
 | 
				
			||||||
 | 
					            this->showTxDetails();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void HistoryWidget::setModel(Coins *coins, TransactionHistoryProxyModel *model, TransactionHistory *txHistory)
 | 
					void HistoryWidget::setModel(Coins *coins, TransactionHistoryProxyModel *model, TransactionHistory *txHistory)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,12 +34,7 @@ XMRToWidget::XMRToWidget(QWidget *parent) :
 | 
				
			||||||
    m_showDetailsAction = m_contextMenu->addAction("Details");
 | 
					    m_showDetailsAction = m_contextMenu->addAction("Details");
 | 
				
			||||||
    m_viewOnXmrToAction = m_contextMenu->addAction("View order on XMR.to");
 | 
					    m_viewOnXmrToAction = m_contextMenu->addAction("View order on XMR.to");
 | 
				
			||||||
    m_viewOnXmrToAction->setIcon(QIcon(":/assets/images/xmrto.png"));
 | 
					    m_viewOnXmrToAction->setIcon(QIcon(":/assets/images/xmrto.png"));
 | 
				
			||||||
    connect(m_showDetailsAction, &QAction::triggered, [&](){
 | 
					    connect(m_showDetailsAction, &QAction::triggered, this, &XMRToWidget::showInfoDialog);
 | 
				
			||||||
        QModelIndex index = ui->historyTable->currentIndex();
 | 
					 | 
				
			||||||
        XmrToOrder *order = this->tableModel->orders->at(index.row());
 | 
					 | 
				
			||||||
        auto * dialog = new XmrToInfoDialog(order, this);
 | 
					 | 
				
			||||||
        dialog->exec();
 | 
					 | 
				
			||||||
    });
 | 
					 | 
				
			||||||
    connect(m_viewOnXmrToAction, &QAction::triggered, [&](){
 | 
					    connect(m_viewOnXmrToAction, &QAction::triggered, [&](){
 | 
				
			||||||
        QModelIndex index = ui->historyTable->currentIndex();
 | 
					        QModelIndex index = ui->historyTable->currentIndex();
 | 
				
			||||||
        XmrToOrder *order = this->tableModel->orders->at(index.row());
 | 
					        XmrToOrder *order = this->tableModel->orders->at(index.row());
 | 
				
			||||||
| 
						 | 
					@ -67,6 +62,8 @@ XMRToWidget::XMRToWidget(QWidget *parent) :
 | 
				
			||||||
    if (m_ctx->isTails || m_ctx->isWhonix) {
 | 
					    if (m_ctx->isTails || m_ctx->isWhonix) {
 | 
				
			||||||
        ui->torCheckBox->setDisabled(true);
 | 
					        ui->torCheckBox->setDisabled(true);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(ui->historyTable, &QTreeView::doubleClicked, this, &XMRToWidget::showInfoDialog);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void XMRToWidget::setHistoryModel(XmrToModel *model) {
 | 
					void XMRToWidget::setHistoryModel(XmrToModel *model) {
 | 
				
			||||||
| 
						 | 
					@ -184,6 +181,14 @@ void XMRToWidget::onEndTransaction() {
 | 
				
			||||||
    ui->btnCreate->setEnabled(true);
 | 
					    ui->btnCreate->setEnabled(true);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void XMRToWidget::showInfoDialog() {
 | 
				
			||||||
 | 
					    QModelIndex index = ui->historyTable->currentIndex();
 | 
				
			||||||
 | 
					    XmrToOrder *order = this->tableModel->orders->at(index.row());
 | 
				
			||||||
 | 
					    auto *dialog = new XmrToInfoDialog(order, this);
 | 
				
			||||||
 | 
					    dialog->exec();
 | 
				
			||||||
 | 
					    dialog->deleteLater();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
XMRToWidget::~XMRToWidget() {
 | 
					XMRToWidget::~XMRToWidget() {
 | 
				
			||||||
    delete ui;
 | 
					    delete ui;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,6 +43,8 @@ signals:
 | 
				
			||||||
    void viewOrder(const QString &orderId);
 | 
					    void viewOrder(const QString &orderId);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
 | 
					    void showInfoDialog();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QMap<QString, TickerWidget*> m_tickerWidgets;
 | 
					    QMap<QString, TickerWidget*> m_tickerWidgets;
 | 
				
			||||||
    QMenu *m_contextMenu;
 | 
					    QMenu *m_contextMenu;
 | 
				
			||||||
    QAction *m_viewOnXmrToAction;
 | 
					    QAction *m_viewOnXmrToAction;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue