davide/palladiumcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from NotRin7/master

Browse Source 
smal fixes
This commit is contained in:
NotRin7
2025-11-20 18:10:31 +01:00
committed by GitHub
parent e3ab6b09cc 8bd7bc2ff8
commit 492a610637
3 changed files with 186 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docker-build/README.md
View File

@@ -6,6 +6,26 @@
- **Docker**: Installed and running ([installation guide](https://docs.docker.com/get-docker/))
- **Disk Space**: At least 15 GB free
## Unified Build Menu (Recommended)
The easiest way to build binaries for one or multiple platforms is using the interactive menu script.
### Usage
```bash
cd docker-build
./build-menu.sh
```
You will be prompted to select the target platforms:
- `1`: Linux x86_64
- `2`: Linux aarch64
- `3`: Linux ARMv7l
- `4`: Windows x86_64
- `5`: Build ALL targets
You can also select multiple targets by separating them with spaces (e.g., `1 4`).
## Linux x86_64
Creates native Linux 64-bit binaries using a Docker container based on Ubuntu 20.04.

89
docker-build/build-menu.sh Normal file
View File

@@ -0,0 +1,89 @@
#!/usr/bin/env bash
set -euo pipefail
# Directory where this script is located
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
# Function to run a build script
run_build() {
local script_name="$1"
local description="$2"
echo "============================================================"
echo "Starting build for: $description"
echo "Script: $script_name"
echo "============================================================"
if [[ -f "${SCRIPT_DIR}/${script_name}" ]]; then
# Ensure it's executable
chmod +x "${SCRIPT_DIR}/${script_name}"
"${SCRIPT_DIR}/${script_name}"
else
echo "Error: Script ${script_name} not found!"
fi
echo "============================================================"
echo "Finished build for: $description"
echo "============================================================"
echo ""
}
show_menu() {
echo "Palladium Core Docker Build System"
echo "----------------------------------"
echo "1) Linux x86_64"
echo "2) Linux aarch64 (ARM64)"
echo "3) Linux armv7l (ARM 32-bit)"
echo "4) Windows x86_64"
echo "5) Build ALL"
echo "0) Exit"
echo ""
}
show_menu
read -p "Enter your choice(s) separated by space (e.g. '1 4' for Linux and Windows): " choices
# Convert string to array
read -ra ADDR <<< "$choices"
# Check if '5' (ALL) is selected
do_all=false
for choice in "${ADDR[@]}"; do
if [[ "$choice" == "5" ]]; then
do_all=true
break
fi
done
if [ "$do_all" = true ]; then
run_build "build-linux-x86_64.sh" "Linux x86_64"
run_build "build-linux-aarch64.sh" "Linux aarch64"
run_build "build-linux-armv7l.sh" "Linux armv7l"
run_build "build-windows.sh" "Windows x86_64"
else
for choice in "${ADDR[@]}"; do
case "$choice" in
1)
run_build "build-linux-x86_64.sh" "Linux x86_64"
;;
2)
run_build "build-linux-aarch64.sh" "Linux aarch64"
;;
3)
run_build "build-linux-armv7l.sh" "Linux armv7l"
;;
4)
run_build "build-windows.sh" "Windows x86_64"
;;
0)
echo "Exiting."
exit 0
;;
*)
echo "Invalid option: $choice"
;;
esac
done
fi
echo "All selected builds completed."

94
src/qt/palladiumgui.cpp
View File

@@ -101,10 +101,23 @@ PalladiumGUI::PalladiumGUI(interfaces::Node& node, const PlatformStyle *_platfor
qApp->setStyleSheet(ts.readAll());
f.close();
}
// Wichtig: Den Haken im Menü setzen!
if(themeAction) {
themeAction->setChecked(true);
}
// Palette setzen
QPalette darkPalette;
darkPalette.setColor(QPalette::Window, QColor(53, 53, 53));
darkPalette.setColor(QPalette::WindowText, Qt::white);
darkPalette.setColor(QPalette::Base, QColor(25, 25, 25));
darkPalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
darkPalette.setColor(QPalette::ToolTipText, Qt::white);
darkPalette.setColor(QPalette::Text, Qt::white);
darkPalette.setColor(QPalette::Button, QColor(53, 53, 53));
darkPalette.setColor(QPalette::ButtonText, Qt::white);
darkPalette.setColor(QPalette::BrightText, Qt::red);
darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
darkPalette.setColor(QPalette::HighlightedText, Qt::black);
qApp->setPalette(darkPalette);
}
//QSettings settings;
@@ -122,21 +135,33 @@ PalladiumGUI::PalladiumGUI(interfaces::Node& node, const PlatformStyle *_platfor
rpcConsole = new RPCConsole(node, _platformStyle, nullptr);
helpMessageDialog = new HelpMessageDialog(node, this, false);
// --- UPDATE CHECKER LAYOUT SETUP ---
QWidget* mainContainer = new QWidget(this);
QVBoxLayout* mainLayout = new QVBoxLayout(mainContainer);
mainLayout->setContentsMargins(0,0,0,0);
mainLayout->setSpacing(0);
updateAlertWidget = new QWidget(mainContainer);
updateAlertWidget->setVisible(false);
mainLayout->addWidget(updateAlertWidget);
#ifdef ENABLE_WALLET
if(enableWallet)
{
/** Create wallet frame and make it the central widget */
walletFrame = new WalletFrame(_platformStyle, this);
setCentralWidget(walletFrame);
mainLayout->addWidget(walletFrame);
} else
#endif // ENABLE_WALLET
{
/* When compiled without wallet or -disablewallet is provided,
* the central widget is the rpc console.
*/
setCentralWidget(rpcConsole);
mainLayout->addWidget(rpcConsole);
Q_EMIT consoleShown(rpcConsole);
}
setCentralWidget(mainContainer);
// Accept D&D of URIs
setAcceptDrops(true);
@@ -145,6 +170,10 @@ PalladiumGUI::PalladiumGUI(interfaces::Node& node, const PlatformStyle *_platfor
// Needs walletFrame to be initialized
createActions();
if (isDark && themeAction) {
themeAction->setChecked(true);
}
// Create application menu bar
createMenuBar();
@@ -228,6 +257,9 @@ PalladiumGUI::PalladiumGUI(interfaces::Node& node, const PlatformStyle *_platfor
});
modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
if (themeAction->isChecked()) {
modalOverlay->setStyleSheet("background-color: #2b2b2b; color: white;");
}
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &PalladiumGUI::showModalOverlay);
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &PalladiumGUI::showModalOverlay);
#ifdef ENABLE_WALLET
@@ -244,16 +276,7 @@ PalladiumGUI::PalladiumGUI(interfaces::Node& node, const PlatformStyle *_platfor
networkManager = new QNetworkAccessManager(this);
connect(networkManager, &QNetworkAccessManager::finished, this, &PalladiumGUI::onUpdateResult);
updateAlertWidget = new QWidget(this);
updateAlertWidget->setVisible(false);
// Versuche das Widget oben im Layout des zentralen Widgets einzufügen
if (this->centralWidget() && this->centralWidget()->layout()) {
QBoxLayout* layout = qobject_cast<QBoxLayout*>(this->centralWidget()->layout());
if (layout) {
layout->insertWidget(0, updateAlertWidget);
}
}
// updateAlertWidget is already initialized and added to layout above
// Check beim Start ausführen
checkUpdate();
@@ -1527,13 +1550,41 @@ void PalladiumGUI::toggleTheme()
qApp->setStyleSheet(ts.readAll());
f.close();
}
// Palette setzen für bessere Kompatibilität
QPalette darkPalette;
darkPalette.setColor(QPalette::Window, QColor(53, 53, 53));
darkPalette.setColor(QPalette::WindowText, Qt::white);
darkPalette.setColor(QPalette::Base, QColor(25, 25, 25));
darkPalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
darkPalette.setColor(QPalette::ToolTipText, Qt::white);
darkPalette.setColor(QPalette::Text, Qt::white);
darkPalette.setColor(QPalette::Button, QColor(53, 53, 53));
darkPalette.setColor(QPalette::ButtonText, Qt::white);
darkPalette.setColor(QPalette::BrightText, Qt::red);
darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
darkPalette.setColor(QPalette::HighlightedText, Qt::black);
qApp->setPalette(darkPalette);
// 2. Speichern, dass er an ist
settings.setValue("darkModeEnabled", true);
if (modalOverlay) {
modalOverlay->setStyleSheet("background-color: #2b2b2b; color: white;");
}
} else {
// 1. Standard Theme (Weiß)
qApp->setStyleSheet("");
qApp->setPalette(style()->standardPalette());
// 2. Speichern, dass er aus ist
settings.setValue("darkModeEnabled", false);
if (modalOverlay) {
modalOverlay->setStyleSheet("");
}
}
}
@@ -1566,6 +1617,9 @@ void PalladiumGUI::onUpdateResult(QNetworkReply* reply)
// Aktuelle Client Version holen
QString currentVersionStr = QString::fromStdString(FormatFullVersion());
if(currentVersionStr.startsWith("v")) {
currentVersionStr.remove(0, 1);
}
// Bereinige currentVersionStr falls nötig, FormatFullVersion gibt oft sowas wie "1.0.0-beta" zurück
// Einfacher String Vergleich oder QVersionNumber (besser)
@@ -1596,7 +1650,13 @@ void PalladiumGUI::onUpdateResult(QNetworkReply* reply)
QPushButton *btn = new QPushButton(tr("Download"), updateAlertWidget);
btn->setStyleSheet("background-color: white; color: #d9534f; font-weight: bold; border-radius: 3px; padding: 3px 10px;");
connect(btn, &QPushButton::clicked, this, &PalladiumGUI::openUpdateLink);
QString url = latestVersionUrl;
connect(btn, &QPushButton::clicked, [this, url]() {
if(!QDesktopServices::openUrl(QUrl(url))) {
QMessageBox::information(this, tr("Update Available"), tr("Please visit: %1").arg(url));
}
});
QPushButton *btnClose = new QPushButton("X", updateAlertWidget);
btnClose->setFlat(true);