Skip to content

Commit 3531d62

Browse files
barrystylebarrystyle
authored
Merge pull request #13 from barrystyle/0.14-pacglobalui
0.14 pacglobalui
2 parents 20c30d6 + 9bf7c99 commit 3531d62

File tree

439 files changed

+428
-9411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+428
-9411
lines changed

‎src/Makefile.qt.include

+68-340
Large diffs are not rendered by default.

‎src/qt/addressbookpage.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
3939
ui->deleteAddress->setIcon(QIcon());
4040
ui->exportButton->setIcon(QIcon());
4141
} else {
42-
ui->newAddress->setIcon(QIcon(":/icons/" + theme + "/add"));
43-
ui->copyAddress->setIcon(QIcon(":/icons/" + theme + "/editcopy"));
44-
ui->deleteAddress->setIcon(QIcon(":/icons/" + theme + "/remove"));
45-
ui->exportButton->setIcon(QIcon(":/icons/" + theme + "/export"));
42+
ui->newAddress->setIcon(QIcon(":/icons/add"));
43+
ui->copyAddress->setIcon(QIcon(":/icons/editcopy"));
44+
ui->deleteAddress->setIcon(QIcon(":/icons/remove"));
45+
ui->exportButton->setIcon(QIcon(":/icons/export"));
4646
}
4747
ui->showAddressQRCode->setIcon(QIcon());
4848

‎src/qt/bitcoingui.cpp

+92-70
Large diffs are not rendered by default.

‎src/qt/bitcoingui.h

+7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <QMenu>
1818
#include <QPoint>
1919
#include <QPushButton>
20+
#include <QToolButton>
2021
#include <QSystemTrayIcon>
2122

2223
#ifdef Q_OS_MAC
@@ -138,6 +139,12 @@ class BitcoinGUI : public QMainWindow
138139
HelpMessageDialog *helpMessageDialog;
139140
ModalOverlay *modalOverlay;
140141

142+
QFrame *headerFrame;
143+
QPushButton *btnImg;
144+
QToolButton *btnRefresh;
145+
QToolButton *btnCopyNews;
146+
QLabel *messageLabel;
147+
141148
#ifdef Q_OS_MAC
142149
CAppNapInhibitor* m_app_nap_inhibitor = nullptr;
143150
#endif

‎src/qt/coincontroldialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void CoinControlDialog::buttonToggleLockClicked()
229229
else{
230230
model->lockCoin(outpt);
231231
item->setDisabled(true);
232-
item->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
232+
item->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
233233
}
234234
updateLabelLocked();
235235
}
@@ -320,7 +320,7 @@ void CoinControlDialog::lockCoin()
320320
COutPoint outpt(uint256S(contextMenuItem->text(COLUMN_TXHASH).toStdString()), contextMenuItem->text(COLUMN_VOUT_INDEX).toUInt());
321321
model->lockCoin(outpt);
322322
contextMenuItem->setDisabled(true);
323-
contextMenuItem->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
323+
contextMenuItem->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
324324
updateLabelLocked();
325325
}
326326

@@ -787,7 +787,7 @@ void CoinControlDialog::updateView()
787787
COutPoint outpt(txhash, out.i);
788788
coinControl->UnSelect(outpt); // just to be sure
789789
itemOutput->setDisabled(true);
790-
itemOutput->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
790+
itemOutput->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
791791
}
792792

793793
// set checkbox

‎src/qt/dash.qrc

+65-361
Large diffs are not rendered by default.

‎src/qt/forms/optionsdialog.ui

-21
Original file line numberDiff line numberDiff line change
@@ -726,27 +726,6 @@ https://www.transifex.com/projects/p/dash/</string>
726726
</property>
727727
</widget>
728728
</item>
729-
<item>
730-
<layout class="QHBoxLayout" name="horizontalLayout_4_Display" stretch="0,0">
731-
<item>
732-
<widget class="QLabel" name="themeLabel">
733-
<property name="text">
734-
<string>User Interface Theme:</string>
735-
</property>
736-
</widget>
737-
</item>
738-
<item>
739-
<widget class="QValueComboBox" name="theme"/>
740-
</item>
741-
</layout>
742-
</item>
743-
<item>
744-
<widget class="Line" name="line">
745-
<property name="orientation">
746-
<enum>Qt::Horizontal</enum>
747-
</property>
748-
</widget>
749-
</item>
750729
<item>
751730
<layout class="QHBoxLayout" name="horizontalLayout_2_Display">
752731
<item>

‎src/qt/forms/sendcoinsentry.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<item row="3" column="1">
181181
<widget class="QLabel" name="messageTextLabel">
182182
<property name="toolTip">
183-
<string>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</string>
183+
<string>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</string>
184184
</property>
185185
<property name="textFormat">
186186
<enum>Qt::PlainText</enum>

‎src/qt/guiutil.cpp

+2-13
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void setupAmountWidget(QLineEdit *widget, QWidget *parent)
148148

149149
bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
150150
{
151-
// return if URI is not valid or is no dash: URI
151+
// return if URI is not valid or is no pac: URI
152152
if(!uri.isValid() || uri.scheme() != QString("dash"))
153153
return false;
154154

@@ -922,18 +922,7 @@ QString getThemeName()
922922
QString loadStyleSheet()
923923
{
924924
QString styleSheet;
925-
QSettings settings;
926-
QString cssName;
927-
QString theme = settings.value("theme", "").toString();
928-
929-
if(!theme.isEmpty()){
930-
cssName = QString(":/css/") + theme;
931-
}
932-
else {
933-
cssName = QString(":/css/light");
934-
settings.setValue("theme", "light");
935-
}
936-
925+
QString cssName = QString(":/css/standard");
937926
QFile qFile(cssName);
938927
if (qFile.open(QFile::ReadOnly)) {
939928
styleSheet = QLatin1String(qFile.readAll());

‎src/qt/locale/dash_ar.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
<translation>فتح URI</translation>
467467
</message>
468468
<message>
469-
<source>Open a dash: URI or payment request</source>
469+
<source>Open a pac: URI or payment request</source>
470470
<translation>افتح شرطة: عنوان أوري أو طلب الدفع</translation>
471471
</message>
472472
<message>
@@ -2960,7 +2960,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29602960
<translation>الرسائل</translation>
29612961
</message>
29622962
<message>
2963-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2963+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29642964
<translation>رسالة تم إرفاقها بخط العطف: عنوان الذي سيتم تخزينه مع المعاملة كمرجع لك. ملاحظة: لن يتم إرسال هذه الرسالة عبر شبكة داش.</translation>
29652965
</message>
29662966
<message>

‎src/qt/locale/dash_bg.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<translation>Отвори &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
485+
<source>Open a pac: URI or payment request</source>
486486
<translation>Отвори PACGlobal: URI или заявка за плащане</translation>
487487
</message>
488488
<message>
@@ -2988,8 +2988,8 @@ https://www.transifex.com/projects/p/dash/</translation>
29882988
<translation>Съобщение:</translation>
29892989
</message>
29902990
<message>
2991-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2992-
<translation>Съобщението което беше прикрепено към dash: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през PACGlobal мрежата.</translation>
2991+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2992+
<translation>Съобщението което беше прикрепено към pac: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през PACGlobal мрежата.</translation>
29932993
</message>
29942994
<message>
29952995
<source>This is an unauthenticated payment request.</source>

‎src/qt/locale/dash_de.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<translation>&amp;URI öffnen...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
485+
<source>Open a pac: URI or payment request</source>
486486
<translation>Eine "dash:"-URI oder Zahlungsanforderung öffnen</translation>
487487
</message>
488488
<message>
@@ -2990,7 +2990,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29902990
<translation>Nachricht:</translation>
29912991
</message>
29922992
<message>
2993-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2993+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29942994
<translation>Eine an die "dash:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das PACGlobal-Netzwerk gesendet.</translation>
29952995
</message>
29962996
<message>

‎src/qt/locale/dash_en.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,8 @@
613613
</message>
614614
<message>
615615
<location line="+1"/>
616-
<source>Open a dash: URI or payment request</source>
617-
<translation>Open a dash: URI or payment request</translation>
616+
<source>Open a pac: URI or payment request</source>
617+
<translation>Open a pac: URI or payment request</translation>
618618
</message>
619619
<message>
620620
<location line="+2"/>
@@ -3868,8 +3868,8 @@ https://www.transifex.com/projects/p/dash/</translation>
38683868
</message>
38693869
<message>
38703870
<location line="+10"/>
3871-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
3872-
<translation>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</translation>
3871+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
3872+
<translation>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</translation>
38733873
</message>
38743874
<message>
38753875
<location line="+433"/>

‎src/qt/locale/dash_es.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@
482482
<translation>Abrir &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
486-
<translation>Abrir un dash: URI o petición de pago</translation>
485+
<source>Open a pac: URI or payment request</source>
486+
<translation>Abrir un pac: URI o petición de pago</translation>
487487
</message>
488488
<message>
489489
<source>&amp;Command-line options</source>
@@ -2988,7 +2988,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29882988
<translation>Mensaje:</translation>
29892989
</message>
29902990
<message>
2991-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2991+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29922992
<translation>Un mensaje que se adjuntó al PACGlobal: URI que será almacenada con la transacción para su referencia. Nota: Este mensaje no se enviará a través de la red PACGlobal.</translation>
29932993
</message>
29942994
<message>

‎src/qt/locale/dash_fi.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<translation>Avaa &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
485+
<source>Open a pac: URI or payment request</source>
486486
<translation>Avaa PACGlobal: URI tai maksupyyntö</translation>
487487
</message>
488488
<message>
@@ -2992,7 +2992,7 @@ Näillä toiminnoilla voit korjata korruptoituneen lohkoketjun tai puuttuvat/van
29922992
<translation>Viesti:</translation>
29932993
</message>
29942994
<message>
2995-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2995+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29962996
<translation>Viesti joka liitettiin PACGlobal: URI joka tallenetaan siirtotapahtuman kanssa viitteeksi sinulle. Huomio: Tätä viestiä ei lähetetä PACGlobal verkkoon.</translation>
29972997
</message>
29982998
<message>

‎src/qt/locale/dash_fr.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<translation>Ouvrir une &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
485+
<source>Open a pac: URI or payment request</source>
486486
<translation>Ouvrir une URI ou demande de paiement PACGlobal</translation>
487487
</message>
488488
<message>
@@ -2988,7 +2988,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29882988
<translation>Message :</translation>
29892989
</message>
29902990
<message>
2991-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2991+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29922992
<translation>Un message joint à l'URI PACGlobal qui sera sauvegardé avec la transaction pour référence. Note : ce message ne sera pas envoyé à travers le réseau PACGlobal.</translation>
29932993
</message>
29942994
<message>

‎src/qt/locale/dash_it.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@
482482
<translation>Apri &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
486-
<translation>Apri un dash: URI o una richiesta di pagamento</translation>
485+
<source>Open a pac: URI or payment request</source>
486+
<translation>Apri un pac: URI o una richiesta di pagamento</translation>
487487
</message>
488488
<message>
489489
<source>&amp;Command-line options</source>
@@ -2988,7 +2988,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29882988
<translation>Messaggio:</translation>
29892989
</message>
29902990
<message>
2991-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2991+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29922992
<translation>Un messaggio allegato con l'URI dash che verrà memorizzato nella transazione per il tuo referente. Nota: questo messaggio non verrà inviato attraverso il network PACGlobal.</translation>
29932993
</message>
29942994
<message>

‎src/qt/locale/dash_ja.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
<translation>URIを開く… (&amp;U)</translation>
467467
</message>
468468
<message>
469-
<source>Open a dash: URI or payment request</source>
469+
<source>Open a pac: URI or payment request</source>
470470
<translation>dash: URIまたは送金リクエストを開く</translation>
471471
</message>
472472
<message>
@@ -2961,7 +2961,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29612961
<translation>メッセージ：</translation>
29622962
</message>
29632963
<message>
2964-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2964+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29652965
<translation>PACGlobal: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはPACGlobalネットワークを経由して送信されるわけではありません。</translation>
29662966
</message>
29672967
<message>

‎src/qt/locale/dash_ko.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
<translation>URI 열기(&amp;U)...</translation>
467467
</message>
468468
<message>
469-
<source>Open a dash: URI or payment request</source>
469+
<source>Open a pac: URI or payment request</source>
470470
<translation>PACGlobal: URI 또는 지불 요청을 엽니다.</translation>
471471
</message>
472472
<message>
@@ -2960,7 +2960,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29602960
<translation>메시지:</translation>
29612961
</message>
29622962
<message>
2963-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2963+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29642964
<translation>대시: URI에 첨부된 메시지는 거래와 함께 참고용으로 저장됩니다. 주의: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
29652965
</message>
29662966
<message>

‎src/qt/locale/dash_nl.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@
482482
<translation>Open &amp;URI</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
486-
<translation>Open een dash: URI of betalingsaanvraag</translation>
485+
<source>Open a pac: URI or payment request</source>
486+
<translation>Open een pac: URI of betalingsaanvraag</translation>
487487
</message>
488488
<message>
489489
<source>&amp;Command-line options</source>
@@ -2994,8 +2994,8 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het PACGlobal n
29942994
<translation>Bericht:</translation>
29952995
</message>
29962996
<message>
2997-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2998-
<translation>Een boodschap die was bijgevoegd aan de dash: URI die met de transactie voor uw referentie wordt opgeslagen. Opmerking: Dit bericht zal niet over het PACGlobal netwerk worden verzonden.</translation>
2997+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2998+
<translation>Een boodschap die was bijgevoegd aan de pac: URI die met de transactie voor uw referentie wordt opgeslagen. Opmerking: Dit bericht zal niet over het PACGlobal netwerk worden verzonden.</translation>
29992999
</message>
30003000
<message>
30013001
<source>This is an unauthenticated payment request.</source>

‎src/qt/locale/dash_pl.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<translation>Otwórz &amp;URI...</translation>
483483
</message>
484484
<message>
485-
<source>Open a dash: URI or payment request</source>
485+
<source>Open a pac: URI or payment request</source>
486486
<translation>Otwórz dash: Link lub żądanie zapłaty</translation>
487487
</message>
488488
<message>
@@ -2988,7 +2988,7 @@ https://www.transifex.com/projects/p/dash/</translation>
29882988
<translation>Wiadomość:</translation>
29892989
</message>
29902990
<message>
2991-
<source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
2991+
<source>A message that was attached to the pac: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the PACGlobal network.</source>
29922992
<translation>Wiadomość, która została dołączona do dash: Link, który zostanie zapisany wraz z transakcją do wglądu w przyszłości. Zauważ, że sama wiadomość nie zostanie wysłana przez sieć PACGlobal.</translation>
29932993
</message>
29942994
<message>

0 commit comments

Comments
 (0)