Skip to content

Commit

Permalink
Merge pull request #2143 from cyrossignol/gui
Browse files Browse the repository at this point in the history
gui: Refresh transaction history page design
  • Loading branch information
jamescowens authored May 20, 2021
2 parents 148d1b1 + a5e773c commit 49e1076
Show file tree
Hide file tree
Showing 70 changed files with 166 additions and 128 deletions.
8 changes: 2 additions & 6 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
// Create tabs
overviewPage = new OverviewPage();

transactionsPage = new QWidget(this);
QVBoxLayout *vbox = new QVBoxLayout();
transactionView = new TransactionView(this);
vbox->addWidget(transactionView);
transactionsPage->setLayout(vbox);

addressBookPage = new QWidget(this);
addressBook = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
Expand All @@ -205,7 +201,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):

centralWidget = new QStackedWidget(this);
centralWidget->addWidget(overviewPage);
centralWidget->addWidget(transactionsPage);
centralWidget->addWidget(transactionView);
centralWidget->addWidget(addressBookPage);
centralWidget->addWidget(receiveCoinsPage);
centralWidget->addWidget(sendCoinsPage);
Expand Down Expand Up @@ -1277,7 +1273,7 @@ void BitcoinGUI::gotoOverviewPage()
void BitcoinGUI::gotoHistoryPage()
{
historyAction->setChecked(true);
centralWidget->setCurrentWidget(transactionsPage);
centralWidget->setCurrentWidget(transactionView);

exportAction->setEnabled(true);
disconnect(exportAction, SIGNAL(triggered()), 0, 0);
Expand Down
3 changes: 1 addition & 2 deletions src/qt/bitcoingui.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ class BitcoinGUI : public QMainWindow
QStackedWidget *centralWidget;

OverviewPage *overviewPage;
QWidget *transactionsPage;
QWidget *addressBookPage;
ReceiveCoinsPage *receiveCoinsPage;
SendCoinsDialog *sendCoinsPage;
TransactionView *transactionView;
VotingDialog *votingPage;
SignVerifyMessageDialog *signVerifyMessageDialog;
std::unique_ptr<QMessageBox> updateMessageDialog;
Expand Down Expand Up @@ -135,7 +135,6 @@ class BitcoinGUI : public QMainWindow
QSystemTrayIcon *trayIcon;
QMenu *trayIconMenu;
Notificator *notificator;
TransactionView *transactionView;
AddressBookPage *addressBook;
RPCConsole *rpcConsole;
DiagnosticsDialog *diagnosticsDialog;
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_af_ZA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4250,7 +4250,7 @@ Dit beteken dat &apos;n fooi van ten minste %2 word benodig.</translation>
</message>
<message>
<location line="-315"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Voer adres of etiket om te soek</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4218,7 +4218,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>ادخل عنوان أووصف للبحث</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_be_BY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4188,7 +4188,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Увядзіце адрас ці пазнаку для пошуку</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Търсене по адрес или име</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_bs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4188,7 +4188,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduïu una adreça o una etiqueta per cercar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ca@valencia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduïu una adreça o una etiqueta per cercar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ca_ES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4192,7 +4192,7 @@ En aquest cas es requereix una comisió d&apos;almenys 2%.</translation>
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduïu una adreça o una etiqueta per cercar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4191,7 +4191,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Zadej adresu nebo označení pro její vyhledání</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4208,7 +4208,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@ Det betyder, at et gebyr på mindst %2 er påkrævet.</translation>
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Indtast adresse eller mærkat for at søge</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4197,7 +4197,7 @@ Dieses Label wird rot, wenn die Priorität kleiner ist als Mittel.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Zu suchende Adresse oder Bezeichnung eingeben</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_el_GR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4224,7 +4224,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_eo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4196,7 +4196,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Tajpu adreson a? etikedon por ser?i</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4197,7 +4197,7 @@ Esto significa que se requiere una cuota de al menos %2.</translation>
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduzca una dirección o etiqueta que buscar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_es_CL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4184,7 +4184,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduce una dirección o etiqueta para buscar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_es_DO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduzca una dirección o etiqueta que buscar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_es_MX.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Ingrese dirección o capa a buscar </translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_es_UY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_et.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Otsimiseks sisesta märgis või aadress</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_eu_ES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Sartu bilatzeko helbide edo etiketa</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4173,7 +4173,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_fa_IR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4198,7 +4198,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4215,7 +4215,7 @@ Tämä tarkoittaa, että ainakin %2 rahansiirtopalkkio tarvitaan.</translation>
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Anna etsittävä osoite tai tunniste</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@ Cela implique que des frais à hauteur d&apos;au moins %2 seront nécessaires.</
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Saisir une adresse ou une étiquette à rechercher</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_fr_CA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@ Les montants inférieurs à 0.546 fois les frais minimum de relais apparaissent
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Saisir une adresse ou une étiquette à rechercher</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_gl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Introduce dirección ou etiqueta para buscar</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_hi_IN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4182,7 +4182,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_hr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4191,7 +4191,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Unesite adresu ili oznaku za pretraživanje</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_hu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4177,7 +4177,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Írd be a keresendő címet vagy címkét</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_id_ID.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4206,7 +4206,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Masukkan alamat atau label untuk mencari</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@ Questa etichetta diventa rossa se la priorità è minore di &quot;media&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>Inserisci un indirizzo o un&apos;etichetta da cercare</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4168,7 +4168,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation>検索するアドレスまたはラベルを入力</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ka.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_kk_KZ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_ko_KR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4168,7 +4168,7 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
</message>
<message>
<location line="+6"/>
<source>Enter address or label to search</source>
<source>Search by address or label</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
Loading

0 comments on commit 49e1076

Please sign in to comment.