Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ad0bb53b4 | |||
| da41cc8718 | |||
| 07e6eccc44 | |||
| f52f83dc71 |
@@ -8,9 +8,6 @@ on:
|
|||||||
branches: [master]
|
branches: [master]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
|
||||||
VERSION: "5.3.7"
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test-linux-unit:
|
test-linux-unit:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
@@ -149,6 +146,13 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set VERSION from source
|
||||||
|
run: |
|
||||||
|
MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
|
||||||
|
echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
@@ -189,6 +193,13 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set VERSION from source
|
||||||
|
run: |
|
||||||
|
MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
|
||||||
|
echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
@@ -225,6 +236,13 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set VERSION from source
|
||||||
|
run: |
|
||||||
|
MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
|
||||||
|
REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
|
||||||
|
echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
brew install qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
|
brew install qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
|
||||||
@@ -289,6 +307,9 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
|
- name: Set VERSION from tag
|
||||||
|
run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Download all artifacts
|
- name: Download all artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@
|
|||||||
// These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it
|
// These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it
|
||||||
#define CLIENT_VERSION_MAJOR 5
|
#define CLIENT_VERSION_MAJOR 5
|
||||||
#define CLIENT_VERSION_MINOR 3
|
#define CLIENT_VERSION_MINOR 3
|
||||||
#define CLIENT_VERSION_REVISION 8
|
#define CLIENT_VERSION_REVISION 9
|
||||||
#define CLIENT_VERSION_BUILD 0
|
#define CLIENT_VERSION_BUILD 0
|
||||||
|
|
||||||
// Converts the parameter X to a string after macro replacement on X has been performed.
|
// Converts the parameter X to a string after macro replacement on X has been performed.
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
|
|||||||
tab(tab)
|
tab(tab)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
if (mode == ForEditing && parent)
|
||||||
|
setWindowFlags(Qt::Widget);
|
||||||
|
else
|
||||||
|
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
||||||
ui->wAddressBookHeader->installEventFilter(new DialogMoveHandler(this));
|
ui->wAddressBookHeader->installEventFilter(new DialogMoveHandler(this));
|
||||||
|
|
||||||
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
||||||
|
|||||||
@@ -28,7 +28,10 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
|
|||||||
model(0)
|
model(0)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
if (parent)
|
||||||
|
setWindowFlags(Qt::Widget);
|
||||||
|
else
|
||||||
|
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
||||||
|
|
||||||
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
||||||
ui->addButton->setIcon(QIcon());
|
ui->addButton->setIcon(QIcon());
|
||||||
|
|||||||
@@ -40,7 +40,10 @@ TransactionView::TransactionView(QWidget *parent) :
|
|||||||
transactionSortOrder(Qt::DescendingOrder)
|
transactionSortOrder(Qt::DescendingOrder)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
if (parent)
|
||||||
|
setWindowFlags(Qt::Widget);
|
||||||
|
else
|
||||||
|
setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
|
||||||
// Build filter row
|
// Build filter row
|
||||||
dateWidget = ui->dateWidget;
|
dateWidget = ui->dateWidget;
|
||||||
dateWidget->addItem(tr("All"), All);
|
dateWidget->addItem(tr("All"), All);
|
||||||
|
|||||||
@@ -284,6 +284,7 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
|
|||||||
createTrayIcon();
|
createTrayIcon();
|
||||||
|
|
||||||
// Create tabs
|
// Create tabs
|
||||||
|
centralWidget = ui->stackedWidget;
|
||||||
overviewPage = new OverviewPage();
|
overviewPage = new OverviewPage();
|
||||||
{
|
{
|
||||||
transactionsPage = new QWidget(this);
|
transactionsPage = new QWidget(this);
|
||||||
@@ -296,15 +297,14 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
|
|||||||
vbox->addWidget(transactionView);
|
vbox->addWidget(transactionView);
|
||||||
frameMain->setLayout(vbox);
|
frameMain->setLayout(vbox);
|
||||||
}
|
}
|
||||||
addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
|
addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab, centralWidget);
|
||||||
|
|
||||||
receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
|
receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab, centralWidget);
|
||||||
|
|
||||||
sendCoinsPage = 0;
|
sendCoinsPage = 0;
|
||||||
messagePage = 0;
|
messagePage = 0;
|
||||||
signMessagePage = 0;
|
signMessagePage = 0;
|
||||||
verifyMessagePage = 0;
|
verifyMessagePage = 0;
|
||||||
centralWidget = ui->stackedWidget;
|
|
||||||
centralWidget->addWidget(overviewPage);
|
centralWidget->addWidget(overviewPage);
|
||||||
centralWidget->addWidget(transactionsPage);
|
centralWidget->addWidget(transactionsPage);
|
||||||
centralWidget->addWidget(addressBookPage);
|
centralWidget->addWidget(addressBookPage);
|
||||||
@@ -641,7 +641,7 @@ void TrianglesGUI::ensureSendCoinsPage()
|
|||||||
if (sendCoinsPage)
|
if (sendCoinsPage)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
sendCoinsPage = new SendCoinsDialog(this);
|
sendCoinsPage = new SendCoinsDialog(centralWidget);
|
||||||
if (walletModel)
|
if (walletModel)
|
||||||
sendCoinsPage->setModel(walletModel);
|
sendCoinsPage->setModel(walletModel);
|
||||||
centralWidget->addWidget(sendCoinsPage);
|
centralWidget->addWidget(sendCoinsPage);
|
||||||
@@ -652,7 +652,7 @@ void TrianglesGUI::ensureMessagePage()
|
|||||||
if (messagePage)
|
if (messagePage)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
messagePage = new MessagePage(this);
|
messagePage = new MessagePage(centralWidget);
|
||||||
if (messageModel)
|
if (messageModel)
|
||||||
messagePage->setModel(messageModel);
|
messagePage->setModel(messageModel);
|
||||||
centralWidget->addWidget(messagePage);
|
centralWidget->addWidget(messagePage);
|
||||||
@@ -663,7 +663,7 @@ void TrianglesGUI::ensureSignMessagePage()
|
|||||||
if (signMessagePage)
|
if (signMessagePage)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
signMessagePage = new SignMessagePage(this);
|
signMessagePage = new SignMessagePage(centralWidget);
|
||||||
if (walletModel)
|
if (walletModel)
|
||||||
signMessagePage->setModel(walletModel);
|
signMessagePage->setModel(walletModel);
|
||||||
centralWidget->addWidget(signMessagePage);
|
centralWidget->addWidget(signMessagePage);
|
||||||
@@ -674,7 +674,7 @@ void TrianglesGUI::ensureVerifyMessagePage()
|
|||||||
if (verifyMessagePage)
|
if (verifyMessagePage)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
verifyMessagePage = new VerifyMessagePage(this);
|
verifyMessagePage = new VerifyMessagePage(centralWidget);
|
||||||
if (walletModel)
|
if (walletModel)
|
||||||
verifyMessagePage->setModel(walletModel);
|
verifyMessagePage->setModel(walletModel);
|
||||||
centralWidget->addWidget(verifyMessagePage);
|
centralWidget->addWidget(verifyMessagePage);
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET = triangles-qt
|
TARGET = triangles-qt
|
||||||
|
|
||||||
VERSION = 5.3.8.0
|
VERSION = 5.3.9.0
|
||||||
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
|
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
|
||||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN BOOST_BIND_GLOBAL_PLACEHOLDERS __NO_SYSTEM_INCLUDES
|
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN BOOST_BIND_GLOBAL_PLACEHOLDERS __NO_SYSTEM_INCLUDES
|
||||||
CONFIG += no_include_pwd
|
CONFIG += no_include_pwd
|
||||||
|
|||||||
Reference in New Issue
Block a user