monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'monero-project:master' into i2p-integration

Browse source
This commit is contained in:
preland 2024-12-04 19:05:03 -06:00 committed by GitHub
commit ea64013ecd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
196 changed files with 222 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View file

@ -91,7 +91,7 @@ jobs:
- name: create .tar - name: create .tar
run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
working-directory: build/bin working-directory: build/bin
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ github.job }} name: ${{ github.job }}
path: build/bin/monero-wallet-gui.tar path: build/bin/monero-wallet-gui.tar
@ -121,7 +121,7 @@ jobs:
run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
- name: test qml - name: test qml
run: xvfb-run -a /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui --test-qml run: xvfb-run -a /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui --test-qml
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ github.job }} name: ${{ github.job }}
path: | path: |
@ -149,7 +149,7 @@ jobs:
run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3' run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3'
- name: sha256sum - name: sha256sum
run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ github.job }} name: ${{ github.job }}
path: | path: |
@ -177,7 +177,7 @@ jobs:
run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android
- name: Remove obsolete docker layers - name: Remove obsolete docker layers
run: docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi || true run: docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi || true
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ github.job }} name: ${{ github.job }}
path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
@ -195,7 +195,7 @@ jobs:
export OUTPUT="$VERSION.tar" export OUTPUT="$VERSION.tar"
echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
/home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT" /home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ env.OUTPUT }} name: ${{ env.OUTPUT }}
path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }} path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}

2
CMakeLists.txt
View file

@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
set(VERSION_MAJOR "18") set(VERSION_MAJOR "18")
set(VERSION_MINOR "3") set(VERSION_MINOR "3")
set(VERSION_REVISION "1") set(VERSION_REVISION "4")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
option(STATIC "Link libraries statically, requires static Qt") option(STATIC "Link libraries statically, requires static Qt")

4
DEPLOY.md
View file

@ -2,7 +2,7 @@
Use macOS 10.12 - 10.13 for better backwards compability. 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 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 ```bash
mkdir build && cd build 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
make deploy make deploy
``` ```

6
Dockerfile.android
View file

@ -43,9 +43,9 @@ RUN echo y | ${ANDROID_SDK_ROOT}/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "
ENV HOST_PATH=${PATH} ENV HOST_PATH=${PATH}
ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH} ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
ARG ZLIB_VERSION=1.3 ARG ZLIB_VERSION=1.3.1
ARG ZLIB_HASH=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e ARG ZLIB_HASH=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ RUN wget -q https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz \
&& echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \
&& tar -xzf zlib-${ZLIB_VERSION}.tar.gz \ && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
&& rm zlib-${ZLIB_VERSION}.tar.gz \ && rm zlib-${ZLIB_VERSION}.tar.gz \

2
Dockerfile.linux
View file

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.12-lts-lgpl ARG QT_VERSION=v5.15.14-lts-lgpl
ENV CFLAGS="-fPIC" ENV CFLAGS="-fPIC"
ENV CPPFLAGS="-fPIC" ENV CPPFLAGS="-fPIC"

2
Dockerfile.windows
View file

@ -1,7 +1,7 @@
FROM ubuntu:20.04 FROM ubuntu:20.04
ARG THREADS=1 ARG THREADS=1
ARG QT_VERSION=v5.15.12-lts-lgpl ARG QT_VERSION=v5.15.14-lts-lgpl
ENV SOURCE_DATE_EPOCH=1397818193 ENV SOURCE_DATE_EPOCH=1397818193
RUN apt update && \ RUN apt update && \

2
LICENSE
View file

@ -1,4 +1,4 @@
Copyright (c) 2014-2018, The Monero Project Copyright (c) 2014-2024, The Monero Project
All rights reserved. All rights reserved.

2
LeftPanel.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
MiddlePanel.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

10
README.md
View file

@ -1,6 +1,6 @@
# Monero GUI # Monero GUI
Copyright (c) 2014-2022, The Monero Project Copyright (c) 2014-2024, The Monero Project
## Table of Contents ## Table of Contents
* [Development resources](#development-resources) * [Development resources](#development-resources)
@ -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/): 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/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/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/) [<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). 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).
@ -87,7 +85,7 @@ Status of the translations:
Packages are available for Packages are available for
* Arch Linux: [monero-gui](https://archlinux.org/packages/extra/x86_64/monero-gui/) * Arch Linux: [monero-gui](https://archlinux.org/packages/extra/x86_64/monero-gui/)
* Void Linux: `xbps-install -S monero-gui` * NixOS: `nix-shell -p monero-gui`
* Flatpak: [Monero GUI](https://flathub.org/apps/details/org.getmonero.Monero) * Flatpak: [Monero GUI](https://flathub.org/apps/details/org.getmonero.Monero)
* GuixSD: `guix package -i monero-gui` * GuixSD: `guix package -i monero-gui`
* macOS (homebrew): `brew install --cask monero-wallet` * macOS (homebrew): `brew install --cask monero-wallet`
@ -107,7 +105,7 @@ Packaging for your favorite distribution would be a welcome contribution!
``` ```
git clone --branch master --recursive https://github.com/monero-project/monero-gui.git git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
``` ```
\* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries. \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
3. Prepare build environment 3. Prepare build environment
``` ```
cd monero-gui cd monero-gui
@ -130,7 +128,7 @@ Packaging for your favorite distribution would be a welcome contribution!
``` ```
git clone --branch master --recursive https://github.com/monero-project/monero-gui.git git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
``` ```
\* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries. \* `master` - replace with the desired version tag (e.g. `v0.18.3.4`) to build the release binaries.
3. Prepare build environment 3. Prepare build environment
``` ```
cd monero-gui cd monero-gui

2
cmake/32-bit-toolchain.cmake
View file

@ -1,4 +1,4 @@
# Copyright (c) 2014-2019, The Monero Project # Copyright (c) 2014-2024, The Monero Project
# #
# All rights reserved. # All rights reserved.
# #

2
cmake/64-bit-toolchain.cmake
View file

@ -1,4 +1,4 @@
# Copyright (c) 2014-2019, The Monero Project # Copyright (c) 2014-2024, The Monero Project
# #
# All rights reserved. # All rights reserved.
# #

2
cmake/VersionGui.cmake
View file

@ -1,4 +1,4 @@
# Copyright (c) 2014-2019, The Monero Project # Copyright (c) 2014-2024, The Monero Project
# #
# All rights reserved. # All rights reserved.
# #

2
components/CheckBox.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/CheckBox2.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/DaemonManagerDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/DatePicker.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/DevicePassphraseDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/Dialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/IconButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/InlineButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/Input.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/InputDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/InputMulti.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/Label.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LabelButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LabelSubheader.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LanguageButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2020, The Monero Project // Copyright (c) 2020-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LanguageSidebar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LineEdit.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/LineEditMulti.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/MenuBar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/MenuButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/Navbar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2021, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/NavbarItem.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/NetworkStatusItem.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/PasswordDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/ProcessingSplash.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/ProgressBar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/QRCodeScanner.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/RadioButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/RemoteNodeDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/RemoteNodeEdit.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/RemoteNodeList.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/StandardButton.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/StandardDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/StandardDropdown.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/SuccessfulTxDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/TipItem.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/TitleBar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/Tooltip.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/TxConfirmationDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/UpdateDialog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2020, The Monero Project // Copyright (c) 2020-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/effects/ColorTransition.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/effects/GradientBackground.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
components/effects/ImageMask.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

BIN
images/trezor5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 305 KiB

2
installers/windows/LICENSE
View file

@ -1,4 +1,4 @@
Copyright (c) 2014-2020, The Monero Project Copyright (c) 2014-2024, The Monero Project
All rights reserved. All rights reserved.

2
installers/windows/Monero.iss
View file

@ -1,5 +1,5 @@
; Monero Fluorine Fermi GUI Wallet Installer for Windows ; Monero Fluorine Fermi GUI Wallet Installer for Windows
; Copyright (c) 2017-2020, The Monero Project ; Copyright (c) 2017-2024, The Monero Project
; See LICENSE ; See LICENSE
#define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe") #define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe")

2
installers/windows/README.md
View file

@ -1,6 +1,6 @@
# Monero GUI Wallet Windows Installer # # Monero GUI Wallet Windows Installer #
Copyright (c) 2017-2020, The Monero Project Copyright (c) 2017-2024, The Monero Project
## Introduction ## ## Introduction ##

2
installers/windows/ReadMe.htm
View file

@ -6,7 +6,7 @@
<body style="font-family: Arial, Helvetica, sans-serif"> <body style="font-family: Arial, Helvetica, sans-serif">
<h1>Monero Fluorine Fermi GUI Wallet</h1> <h1>Monero Fluorine Fermi GUI Wallet</h1>
<p>Copyright (c) 2014-2020, The Monero Project</p> <p>Copyright (c) 2014-2024, The Monero Project</p>
<h2>Preface</h2> <h2>Preface</h2>

2
js/TxUtils.js
View file

@ -70,7 +70,7 @@ function checkSignature(signature) {
} }
function isValidOpenAliasAddress(address) { 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)) { if (!regex.test(address)) {
return false; return false;

2
js/Wizard.js
View file

@ -166,7 +166,7 @@ function getApproximateBlockchainHeight(_date, _nettype){
if(_nettype == "Testnet" || _nettype == "Stagenet"){ if(_nettype == "Testnet" || _nettype == "Stagenet"){
// testnet got some huge rollbacks, so the estimation is way off // 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) if(approxBlockchainHeight > approximateTestnetRolledBackBlocks)
approxBlockchainHeight -= approximateTestnetRolledBackBlocks approxBlockchainHeight -= approximateTestnetRolledBackBlocks
} }

2
main.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
monero

@ -1 +1 @@
Subproject commit 2656cdf5056c07684741c4425a051760b97025b0 Subproject commit b089f9ee69924882c5d14dd1a6991deb05d9d1cd

2
pages/Account.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/AddressBook.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Advanced.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021, The Monero Project // Copyright (c) 2021-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/History.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Keys.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Mining.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Receive.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/SharedRingDB.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2018, The Monero Project // Copyright (c) 2018-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Sign.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/Transfer.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/TxKey.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/merchant/MerchantTitlebar.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/Settings.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/SettingsInfo.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/SettingsLayout.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/SettingsLog.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/SettingsNode.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
pages/settings/SettingsWallet.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2018, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

1
qml.qrc
View file

@ -284,6 +284,7 @@
<file>images/ledgerNanoX.png</file> <file>images/ledgerNanoX.png</file>
<file>images/ledgerStax.png</file> <file>images/ledgerStax.png</file>
<file>images/trezor3.png</file> <file>images/trezor3.png</file>
<file>images/trezor5.png</file>
<file>images/trezorT.png</file> <file>images/trezorT.png</file>
<file>images/trezorT@2x.png</file> <file>images/trezorT@2x.png</file>
<file>qtquickcontrols2.conf</file> <file>qtquickcontrols2.conf</file>

2
src/NetworkType.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/Decoder.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2020, The Monero Project // Copyright (c) 2020-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/Decoder.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2020, The Monero Project // Copyright (c) 2020-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/QrCodeScanner.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/QrCodeScanner.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/QrScanThread.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/QR-Code-scanner/QrScanThread.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/TranslationManager.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/TranslationManager.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/daemon/DaemonManager.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/daemon/DaemonManager.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/libwalletqt/AddressBook.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/libwalletqt/AddressBook.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/libwalletqt/PassphraseHelper.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/libwalletqt/PassphraseHelper.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2020, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

2
src/libwalletqt/PendingTransaction.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014-2019, The Monero Project // Copyright (c) 2014-2024, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //

Some files were not shown because too many files have changed in this diff Show more