aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPLOY.md4
-rw-r--r--README.md2
-rw-r--r--images/trezor5.pngbin0 -> 312450 bytes
-rw-r--r--js/TxUtils.js2
-rw-r--r--js/Wizard.js2
-rw-r--r--qml.qrc1
-rw-r--r--src/main/oshelper.cpp4
-rw-r--r--src/qt/macoshelper.h1
-rw-r--r--src/qt/macoshelper.mm35
-rw-r--r--src/qt/utils.cpp2
-rw-r--r--wizard/WizardCreateDevice1.qml3
11 files changed, 9 insertions, 47 deletions
diff --git a/DEPLOY.md b/DEPLOY.md
index b5b36ff5..1902c8cb 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -2,7 +2,7 @@
Use macOS 10.12 - 10.13 for better backwards compability.
-1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`
+1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf@21 libgcrypt hidapi libusb cmake pkg-config && brew link protobuf@21`
2. Get the latest LTS from here: https://www.qt.io/offline-installers and install
@@ -12,7 +12,7 @@ Use macOS 10.12 - 10.13 for better backwards compability.
```bash
mkdir build && cd build
-cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 ..
+cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=/path/to/Qt5.12.8/5.12.8/clang_64 ..
make
make deploy
```
diff --git a/README.md b/README.md
index fce4f683..956c4cd5 100644
--- a/README.md
+++ b/README.md
@@ -60,9 +60,7 @@ The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`
GUI development funding and/or some supporting services are also graciously provided by [sponsors](https://www.getmonero.org/community/sponsorships/):
[<img width="150" src="https://www.getmonero.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/globee.png"/>](https://globee.com/)
[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://symas.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
[<img width="150" src="https://www.getmonero.org/img/sponsors/macstadium.png"/>](https://www.macstadium.com/)
There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).
diff --git a/images/trezor5.png b/images/trezor5.png
new file mode 100644
index 00000000..32dc0dbe
--- /dev/null
+++ b/images/trezor5.png
Binary files differ
diff --git a/js/TxUtils.js b/js/TxUtils.js
index 14a7d519..7b028b3e 100644
--- a/js/TxUtils.js
+++ b/js/TxUtils.js
@@ -70,7 +70,7 @@ function checkSignature(signature) {
}
function isValidOpenAliasAddress(address) {
- var regex = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure
+ var regex = /^[A-Za-z0-9-@]+(\.[A-Za-z0-9-]+)+$/; // Basic domain structure, allow email-like address
if (!regex.test(address)) {
return false;
diff --git a/js/Wizard.js b/js/Wizard.js
index d47d1684..f1a56ff6 100644
--- a/js/Wizard.js
+++ b/js/Wizard.js
@@ -166,7 +166,7 @@ function getApproximateBlockchainHeight(_date, _nettype){
if(_nettype == "Testnet" || _nettype == "Stagenet"){
// testnet got some huge rollbacks, so the estimation is way off
- var approximateTestnetRolledBackBlocks = _nettype == "Testnet" ? 342100 : 30000;
+ var approximateTestnetRolledBackBlocks = _nettype == "Testnet" ? 342100 : _nettype == "Stagenet" ? 60000 : 30000;
if(approxBlockchainHeight > approximateTestnetRolledBackBlocks)
approxBlockchainHeight -= approximateTestnetRolledBackBlocks
}
diff --git a/qml.qrc b/qml.qrc
index 2b3dfce2..d4bd45a6 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -283,6 +283,7 @@
<file>images/ledgerNanoX.png</file>
<file>images/ledgerStax.png</file>
<file>images/trezor3.png</file>
+ <file>images/trezor5.png</file>
<file>images/trezorT.png</file>
<file>images/trezorT@2x.png</file>
<file>qtquickcontrols2.conf</file>
diff --git a/src/main/oshelper.cpp b/src/main/oshelper.cpp
index 766aac5d..f9e33d13 100644
--- a/src/main/oshelper.cpp
+++ b/src/main/oshelper.cpp
@@ -70,9 +70,6 @@ namespace
QPixmap screenshot()
{
-#ifdef Q_OS_MAC
- return MacOSHelper::screenshot();
-#else
std::unordered_set<QWindow *> hidden;
const QWindowList windows = QGuiApplication::allWindows();
for (QWindow *window : windows)
@@ -91,7 +88,6 @@ QPixmap screenshot()
});
return QGuiApplication::primaryScreen()->grabWindow(0);
-#endif
}
} // namespace
diff --git a/src/qt/macoshelper.h b/src/qt/macoshelper.h
index 7a7f2486..6bb7748d 100644
--- a/src/qt/macoshelper.h
+++ b/src/qt/macoshelper.h
@@ -38,7 +38,6 @@ class MacOSHelper
public:
static bool isCapsLock();
static bool openFolderAndSelectItem(const QUrl &path);
- static QPixmap screenshot();
static QString bundlePath();
static void disableWindowTabbing();
};
diff --git a/src/qt/macoshelper.mm b/src/qt/macoshelper.mm
index 47d22c44..eb96ef84 100644
--- a/src/qt/macoshelper.mm
+++ b/src/qt/macoshelper.mm
@@ -68,41 +68,6 @@ bool MacOSHelper::openFolderAndSelectItem(const QUrl &path)
return true;
}
-QPixmap MacOSHelper::screenshot()
-{
- std::unordered_set<uintptr_t> appWindowIds;
- for (NSWindow *window in [NSApp windows])
- {
- appWindowIds.insert((uintptr_t)[window windowNumber]);
- }
-
- CFArrayRef onScreenWindows = CGWindowListCreate(kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
- const auto onScreenWindowsClenaup = sg::make_scope_guard([&onScreenWindows]() {
- CFRelease(onScreenWindows);
- });
-
- CFMutableArrayRef foreignWindows = CFArrayCreateMutable(NULL, CFArrayGetCount(onScreenWindows), NULL);
- const auto foreignWindowsClenaup = sg::make_scope_guard([&foreignWindows]() {
- CFRelease(foreignWindows);
- });
-
- for (CFIndex index = 0, count = CFArrayGetCount(onScreenWindows); index < count; ++index)
- {
- const uintptr_t windowId = reinterpret_cast<const uintptr_t>(CFArrayGetValueAtIndex(onScreenWindows, index));
- if (appWindowIds.find(windowId) == appWindowIds.end())
- {
- CFArrayAppendValue(foreignWindows, reinterpret_cast<const void *>(windowId));
- }
- }
-
- CGImageRef image = CGWindowListCreateImageFromArray(CGRectInfinite, foreignWindows, kCGWindowListOptionAll);
- const auto imageClenaup = sg::make_scope_guard([&image]() {
- CFRelease(image);
- });
-
- return QtMac::fromCGImageRef(image);
-}
-
QString MacOSHelper::bundlePath()
{
NSBundle *main = [NSBundle mainBundle];
diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
index f4eafab2..a2f0962c 100644
--- a/src/qt/utils.cpp
+++ b/src/qt/utils.cpp
@@ -96,7 +96,7 @@ QString xdgMime(){
"X-GNOME-FullName=Monero-GUI\n"
"Comment=Monero GUI\n"
"Keywords=Monero;\n"
- "Exec=%1 %u\n"
+ "Exec=\"%1\" %u\n"
"Terminal=false\n"
"Type=Application\n"
"Icon=monero\n"
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 476ddbf9..2310ed12 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -58,6 +58,7 @@ Rectangle {
ListElement { column1: "Ledger Stax"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
ListElement { column1: "Trezor Safe 3"; column2: "Trezor";}
+ ListElement { column1: "Trezor Safe 5"; column2: "Trezor";}
}
ColumnLayout {
@@ -169,6 +170,8 @@ Rectangle {
return "qrc:///images/trezorT.png";
} else if (trezorType == "Trezor Safe 3") {
return "qrc:///images/trezor3.png";
+ } else if (trezorType == "Trezor Safe 5") {
+ return "qrc:///images/trezor5.png";
}
} else if (hardwareWalletType == "Ledger") {
if (ledgerType == "Ledger Nano S") {
generated by cgit v1.2.3 (git 2.51.0) at 2026-08-16 00:33:29 +0000