d0s3t3ch/wowlet
1
0
Fork 0
mirror of https://git.wownero.com/wowlet/wowlet.git synced 2024-08-15 01:03:14 +00:00
Code Issues Projects Releases Wiki Activity

rename to wowlet

Browse source
This commit is contained in:
wowario 2021-02-22 09:51:09 +03:00
parent 5e6bd0b9bb
commit c7c4237d10
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
25 changed files with 114 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.drone.yml
View file

@ -5,7 +5,7 @@ name: linux-release
steps:
- name: build
image: wowllet:linux
image: wowlet:linux
volumes:
- name: ccache_linux_release
path: /root/.ccache
@ -20,7 +20,7 @@ steps:
OPENSSL_ROOT_DIR: /usr/local/openssl/
CMAKEFLAGS_EXTRA: -DFETCH_DEPS=Off
- name: deploy
image: wowllet:linux
image: wowlet:linux
volumes:
- name: ccache_linux_release
path: /root/.ccache
@ -29,19 +29,19 @@ steps:
- name: files_linux_appimage
path: /linux-release-appimage
commands:
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowlet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/linux-release/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- strip -s build/bin/wowllet
- zip -j "$TARGET_DIR/$FN" build/wowllet.log build/bin/wowllet
- strip -s build/bin/wowlet
- zip -j "$TARGET_DIR/$FN" build/wowlet.log build/bin/wowlet
- echo "[*] written to https://ci.wownero.com/files/linux-release/$DRONE_SOURCE_BRANCH/$FN"
- # AppImage
- export FN="wowllet-`git rev-parse --short HEAD`.AppImage"
- export FN="wowlet-`git rev-parse --short HEAD`.AppImage"
- export TARGET_DIR="/linux-release-appimage/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- mv "wowllet.AppImage" "$TARGET_DIR/$FN"
- mv "wowlet.AppImage" "$TARGET_DIR/$FN"
- echo "[*] written to https://vi.wownero.com/files/linux-release-appimage/$DRONE_SOURCE_BRANCH/$FN"
volumes:
@ -64,7 +64,7 @@ type: docker
name: windows-release
steps:
- name: build
image: wowllet:win
image: wowlet:win
volumes:
- name: ccache_win_release
path: /root/.ccache
@ -77,16 +77,16 @@ steps:
environment:
CMAKEFLAGS_EXTRA: -DFETCH_DEPS=Off
- name: deploy
image: wowllet:win
image: wowlet:win
volumes:
- name: files_win_release
path: /files
commands:
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowlet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/files/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- zip -j "$TARGET_DIR/$FN" build/x86_64-w64-mingw32/release/bin/wowllet.exe
- zip -j "$TARGET_DIR/$FN" build/x86_64-w64-mingw32/release/bin/wowlet.exe
- echo "[*] written to https://ci.wownero.com/files-wow/windows-release/$DRONE_SOURCE_BRANCH/$FN"
volumes:
- name: ccache_win_release
@ -106,25 +106,25 @@ name: mac-release
steps:
- name: build
image: wowllet:mac
image: wowlet:mac
volumes:
- name: files_mac_release
path: /files
commands:
- mkdir -p build
- ssh administrator@steve.jobs.xmr.pm "chmod +x build_wow_macos.sh && PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ~/build_wow_macos.sh $DRONE_COMMIT_SHA"
- scp -P22 administrator@steve.jobs.xmr.pm:wowllet.zip build/wowllet.zip
- scp -P22 administrator@steve.jobs.xmr.pm:wowlet.zip build/wowlet.zip
- name: deploy
image: wowllet:mac
image: wowlet:mac
volumes:
- name: files_mac_release
path: /files
commands:
- export FN="wowllet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export FN="wowlet-`echo $DRONE_COMMIT_AFTER | cut -c 1-7`.zip"
- export TARGET_DIR="/files/$DRONE_SOURCE_BRANCH"
- mkdir -p "$TARGET_DIR"
- echo "writing to $TARGET_DIR/$FN"
- mv build/wowllet.zip "$TARGET_DIR/$FN"
- mv build/wowlet.zip "$TARGET_DIR/$FN"
- echo "[*] written to https://ci.wownero.com/mac-release/$DRONE_SOURCE_BRANCH/$FN"
volumes:

12
cmake/Deploy.cmake
View file

@ -7,7 +7,7 @@ if(APPLE OR (WIN32 AND NOT STATIC))
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
add_custom_command(TARGET deploy
POST_BUILD
COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:wowllet>/../.." -always-overwrite
COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:wowlet>/../.." -always-overwrite
COMMENT "Running macdeployqt..."
)
@ -16,11 +16,11 @@ if(APPLE OR (WIN32 AND NOT STATIC))
if(_qt_svg_dylib)
add_custom_command(TARGET deploy
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowllet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
COMMENT "Copying libqsvg.dylib, running install_name_tool"
)
endif()

18
contrib/build-appimage.sh
View file

@ -3,17 +3,17 @@
set -e
unset SOURCE_DATE_EPOCH
APPDIR="$PWD/wowllet.AppDir"
APPDIR="$PWD/wowlet.AppDir"
mkdir -p "$APPDIR"
mkdir -p "$APPDIR/usr/share/applications/"
mkdir -p "$APPDIR/usr/bin"
cp "$PWD/src/assets/wowllet.desktop" "$APPDIR/usr/share/applications/wowllet.desktop"
cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/wowllet.png"
cp "$PWD/build/bin/wowllet" "$APPDIR/usr/bin/wowllet"
cp "$PWD/src/assets/wowlet.desktop" "$APPDIR/usr/share/applications/wowlet.desktop"
cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/wowlet.png"
cp "$PWD/build/bin/wowlet" "$APPDIR/usr/bin/wowlet"
LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun feather.AppDir/usr/share/applications/wowllet.desktop -bundle-non-qt-libs
LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun feather.AppDir/usr/share/applications/wowlet.desktop -bundle-non-qt-libs
find feather.AppDir/ -exec touch -h -a -m -t 202101010100.00 {} \;
@ -27,7 +27,7 @@ mksquashfs feather.AppDir feather.squashfs -info -root-owned -no-xattrs -noappen
# mksquashfs writes a timestamp to the header
printf '\x00\x00\x00\x00' | dd conv=notrunc of=feather.squashfs bs=1 seek=$((0x8))
rm -f wowllet.AppImage
cat runtime-x86_64 >> wowllet.AppImage
cat feather.squashfs >> wowllet.AppImage
chmod a+x wowllet.AppImage
rm -f wowlet.AppImage
cat runtime-x86_64 >> wowlet.AppImage
cat feather.squashfs >> wowlet.AppImage
chmod a+x wowlet.AppImage

50
src/CMakeLists.txt
View file

@ -70,29 +70,29 @@ if(APPLE)
list(APPEND RESOURCES ${ICON})
endif()
add_executable(wowllet ${EXECUTABLE_FLAG} main.cpp
add_executable(wowlet ${EXECUTABLE_FLAG} main.cpp
${SOURCE_FILES}
${RESOURCES}
${ASSETS_TOR}
)
# mac os bundle
set_target_properties(wowllet PROPERTIES
set_target_properties(wowlet PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/utils/Info.plist"
LINK_FLAGS_RELEASE -s
)
set_property(TARGET wowllet PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set_property(TARGET wowlet PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
target_include_directories(wowllet PUBLIC ${OPENGL_INCLUDE_DIR})
target_include_directories(wowllet PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
target_include_directories(wowlet PUBLIC ${OPENGL_INCLUDE_DIR})
target_include_directories(wowlet PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
file(GLOB_RECURSE SRC_SOURCES *.cpp)
file(GLOB_RECURSE SRC_HEADERS *.h)
target_include_directories(wowllet PUBLIC
target_include_directories(wowlet PUBLIC
${CMAKE_BINARY_DIR}/src/feather_autogen/include
${CMAKE_SOURCE_DIR}/monero/include
${CMAKE_SOURCE_DIR}/monero/src
@ -119,38 +119,38 @@ target_include_directories(wowllet PUBLIC
)
if(DONATE_BEG)
target_compile_definitions(wowllet PRIVATE DONATE_BEG=1)
target_compile_definitions(wowlet PRIVATE DONATE_BEG=1)
endif()
if(TOR_BIN)
target_compile_definitions(wowllet PRIVATE HAS_TOR_BIN=1)
target_compile_definitions(wowlet PRIVATE HAS_TOR_BIN=1)
endif()
if(XMRIG)
target_compile_definitions(wowllet PRIVATE HAS_XMRIG=1)
target_compile_definitions(wowlet PRIVATE HAS_XMRIG=1)
endif()
if(HAVE_SYS_PRCTL_H)
target_compile_definitions(wowllet PRIVATE HAVE_SYS_PRCTL_H=1)
target_compile_definitions(wowlet PRIVATE HAVE_SYS_PRCTL_H=1)
endif()
if(STATIC)
target_compile_definitions(wowllet PRIVATE STATIC=1)
target_compile_definitions(wowlet PRIVATE STATIC=1)
endif()
if(STATIC)
target_compile_definitions(wowllet PRIVATE STATIC=1)
target_compile_definitions(wowlet PRIVATE STATIC=1)
endif()
if("$ENV{DRONE}" STREQUAL "true")
target_compile_definitions(wowllet PRIVATE DRONE=1)
target_compile_definitions(wowlet PRIVATE DRONE=1)
endif()
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(wowllet PRIVATE QT_NO_DEBUG=1)
target_compile_definitions(wowlet PRIVATE QT_NO_DEBUG=1)
endif()
target_compile_definitions(wowllet
target_compile_definitions(wowlet
PUBLIC
${Qt5Core_DEFINITIONS}
${Qt5Widgets_DEFINITIONS}
@ -166,12 +166,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
if(UNIX AND NOT APPLE)
# https://stackoverflow.com/questions/57766620/cmake-add-library-doesnt-initialize-static-global-variable
# so that contrib/monero-seed/src/gf_elem.cpp properly initializes. A better solution is welcome.
target_link_libraries(wowllet -Wl,--whole-archive monero-seed::monero-seed -Wl,--no-whole-archive)
target_link_libraries(wowlet -Wl,--whole-archive monero-seed::monero-seed -Wl,--no-whole-archive)
else()
target_link_libraries(wowllet monero-seed::monero-seed)
target_link_libraries(wowlet monero-seed::monero-seed)
endif()
target_link_libraries(wowllet
target_link_libraries(wowlet
wallet_merged
${LMDB_LIBRARY}
epee
@ -198,38 +198,38 @@ target_link_libraries(wowllet
)
if(APPLE)
target_link_libraries(wowllet
target_link_libraries(wowlet
KDMacTouchBar
)
target_include_directories(wowllet
target_include_directories(wowlet
PUBLIC ../contrib/KDMacTouchBar)
endif()
if(NOT APPLE)
target_link_libraries(wowllet
target_link_libraries(wowlet
Qt5::QSvgIconPlugin
Qt5::QSvgPlugin
)
endif()
if(STATIC)
target_link_libraries(wowllet
target_link_libraries(wowlet
Qt5::QSvgIconPlugin
Qt5::QSvgPlugin)
if(UNIX AND NOT APPLE)
target_link_libraries(wowllet
target_link_libraries(wowlet
Qt5::QXcbIntegrationPlugin)
endif()
endif()
if(X11_FOUND)
target_link_libraries(wowllet ${X11_LIBRARIES})
target_link_libraries(wowlet ${X11_LIBRARIES})
endif()
if(APPLE)
include(Deploy)
endif()
install(TARGETS wowllet
install(TARGETS wowlet
DESTINATION ${CMAKE_INSTALL_PREFIX}
)

10
src/appcontext.cpp
View file

@ -45,11 +45,11 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
QString appImagePath = qgetenv("APPIMAGE");
if (appImagePath.isEmpty()) {
qDebug() << "Not an appimage, using currentPath()";
return QDir::currentPath() + "/.wowllet";
return QDir::currentPath() + "/.wowlet";
}
QFileInfo appImageDir(appImagePath);
return appImageDir.absoluteDir().path() + "/.wowllet";
return appImageDir.absoluteDir().path() + "/.wowlet";
}();
@ -81,7 +81,7 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
if (!QDir().mkpath(defaultWalletDir))
qCritical() << "Unable to create dir: " << defaultWalletDir;
this->configDirectory = QString("%1/.config/wowllet/").arg(this->configRoot);
this->configDirectory = QString("%1/.config/wowlet/").arg(this->configRoot);
#if defined(Q_OS_UNIX)
if(!this->configDirectory.endsWith('/'))
this->configDirectory = QString("%1/").arg(this->configDirectory);
@ -310,7 +310,7 @@ void AppContext::onWalletOpened(Wallet *wallet) {
if(errMsg == QString("basic_string::_M_replace_aux") || errMsg == QString("std::bad_alloc")) {
qCritical() << errMsg;
this->walletManager->clearWalletCache(this->walletPath);
errMsg = QString("%1\n\nAttempted to clean wallet cache. Please restart WOWllet.").arg(errMsg);
errMsg = QString("%1\n\nAttempted to clean wallet cache. Please restart WOWlet.").arg(errMsg);
this->closeWallet(false);
emit walletOpenedError(errMsg);
} else if(errMsg.contains("wallet cannot be opened as")) {
@ -361,7 +361,7 @@ void AppContext::onWalletOpened(Wallet *wallet) {
void AppContext::setWindowTitle(bool mining) {
QFileInfo fileInfo(this->walletPath);
auto title = QString("WOWllet - [%1]").arg(fileInfo.fileName());
auto title = QString("WOWlet - [%1]").arg(fileInfo.fileName());
if(this->walletViewOnly)
title += " [view-only]";
if(mining)

4
src/assets.qrc
View file

@ -3,7 +3,7 @@
<file>assets/about.txt</file>
<file>assets/ack.txt</file>
<file>assets/contributors.txt</file>
<file>assets/wowllet.desktop</file>
<file>assets/wowlet.desktop</file>
<file>assets/nodes.json</file>
<file>assets/images/appicons/32x32.png</file>
<file>assets/images/appicons/48x48.png</file>
@ -37,7 +37,7 @@
<file>assets/images/expired_icon.png</file>
<file>assets/images/eye1.png</file>
<file>assets/images/eye_blind.png</file>
<file>assets/images/wowllet.png</file>
<file>assets/images/wowlet.png</file>
<file>assets/images/file.png</file>
<file>assets/images/gnome-calc.png</file>
<file>assets/images/history.png</file>

2
src/assets/about.txt
View file

@ -1,4 +1,4 @@
WOWllet <feather_version> (<feather_git_head>)
WOWlet <feather_version> (<feather_git_head>)
Website: https://wownero.org
E-mail: dev@wownero.org

4
src/assets/ack.txt
View file

@ -1,8 +1,8 @@
WOWllet is a fork of Feather (https://git.featherwallet.org/feather/feather).
WOWlet is a fork of Feather (https://git.featherwallet.org/feather/feather).
The wallet UI is heavily inspired by Electrum. We would like to recognize Thomas Voegtlin for his pioneering work on Bitcoin.
WOWllet uses monero-seed written by Tevador, for 14 word mnemonic seeds.
WOWlet uses monero-seed written by Tevador, for 14 word mnemonic seeds.
Wizard banner art was adapted from a paper wallet design by the themonera (themonera.art).

8
src/assets/wowllet.desktop
View file

@ -1,11 +1,11 @@
[Desktop Entry]
Comment=Lightweight Wownero Wallet
Exec=wowllet
Exec=wowlet
GenericName[en_US]=Wownero Wallet
GenericName=Wownero Wallet
Icon=wowllet
Name[en_US]=WOWllet
Name=WOWllet
Icon=wowlet
Name[en_US]=WOWlet
Name=WOWlet
Categories=Finance;Network;
StartupNotify=false
StartupWMClass=feather

2
src/dialog/aboutdialog.ui
View file

@ -27,7 +27,7 @@
</property>
<widget class="QWidget" name="Feather">
<attribute name="title">
<string>WOWllet</string>
<string>WOWlet</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

2
src/dialog/debuginfodialog.cpp
View file

@ -89,7 +89,7 @@ QString DebugInfoDialog::statusToString(Wallet::ConnectionStatus status) {
void DebugInfoDialog::copyToClipboad() {
// Two spaces at the end of each line are for newlines in Markdown
QString text = "";
text += QString("WOWllet version: %1 \n").arg(ui->label_featherVersion->text());
text += QString("WOWlet version: %1 \n").arg(ui->label_featherVersion->text());
text += QString("Wownero version: %1 \n").arg(ui->label_moneroVersion->text());
text += QString("Wallet height: %1 \n").arg(ui->label_walletHeight->text());

2
src/dialog/debuginfodialog.ui
View file

@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>WOWllet version:</string>
<string>WOWlet version:</string>
</property>
</widget>
</item>

8
src/main.cpp
View file

@ -41,7 +41,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
}
QCommandLineParser parser;
parser.setApplicationDescription("wowllet");
parser.setApplicationDescription("wowlet");
parser.addHelpOption();
parser.addVersionOption();
@ -96,7 +96,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
if(cliMode) {
QCoreApplication cli_app(argc, argv);
QCoreApplication::setApplicationName("wowllet");
QCoreApplication::setApplicationName("wowlet");
QCoreApplication::setOrganizationDomain("wownero.org");
QCoreApplication::setOrganizationName("wownero.org");
@ -129,7 +129,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
QApplication app(argc, argv);
QApplication::setApplicationName("wowllet");
QApplication::setApplicationName("wowlet");
QApplication::setOrganizationDomain("wownero.org");
QApplication::setOrganizationName("wownero.org");
@ -138,7 +138,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
if(!quiet) {
QMap<QString, QString> info;
info["Qt"] = QT_VERSION_STR;
info["WOWllet"] = FEATHER_VERSION;
info["WOWlet"] = FEATHER_VERSION;
if (stagenet) info["Mode"] = "Stagenet";
else if (testnet) info["Mode"] = "Testnet";
else info["Mode"] = "Mainnet";

26
src/mainwindow.cpp
View file

@ -89,9 +89,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
connect(ui->actionReport_bug, &QAction::triggered, [this](){
QMessageBox::information(this, "Reporting Bugs",
"<body>Please report any bugs as issues on our git repo:<br>\n"
"<a href=\"https://git.wownero.com/wownero/wowllet/issues\" style=\"color: #33A4DF\">https://git.wownero.com/wownero/wowllet/issues</a><br/><br/>"
"<a href=\"https://git.wownero.com/wownero/wowlet/issues\" style=\"color: #33A4DF\">https://git.wownero.com/wownero/wowlet/issues</a><br/><br/>"
"\n"
"Before reporting a bug, upgrade to the most recent version of WOWllet "
"Before reporting a bug, upgrade to the most recent version of WOWlet "
"(latest release or git HEAD), and include the version number in your report. "
"Try to explain not only what the bug is, but how it occurs.</body>");
});
@ -177,9 +177,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
});
connect(m_ctx, &AppContext::donationNag, [=]{
auto msg = "WOWllet is a 100% community-sponsored endeavor. Please consider supporting "
auto msg = "WOWlet is a 100% community-sponsored endeavor. Please consider supporting "
"the project financially. Get rid of this message by donating any amount.";
int ret = QMessageBox::information(this, "Donate to WOWllet", msg, QMessageBox::Yes, QMessageBox::No);
int ret = QMessageBox::information(this, "Donate to WOWlet", msg, QMessageBox::Yes, QMessageBox::No);
switch (ret) {
case QMessageBox::Yes:
this->donateButtonClicked();
@ -229,7 +229,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
// testnet/stagenet warning
auto worthlessWarning = QString("WOWllet is currently running in %1 mode. This is meant "
auto worthlessWarning = QString("WOWlet is currently running in %1 mode. This is meant "
"for developers only. Your coins are WORTHLESS.");
if(m_ctx->networkType == NetworkType::STAGENET) {
if (config()->get(Config::warnOnStagenet).toBool()) {
@ -245,7 +245,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
}
if(config()->get(Config::warnOnAlpha).toBool()) {
QString warning = "WOWllet is currently in beta.\n\nPlease report any bugs "
QString warning = "WOWlet is currently in beta.\n\nPlease report any bugs "
"you encounter on our Git repository, IRC freenode #wownero or on /r/Wowonero.";
QMessageBox::warning(this, "Beta Warning", warning);
config()->set(Config::warnOnAlpha, false);
@ -327,7 +327,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
// init touchbar
#ifdef Q_OS_MAC
m_touchbar = new KDMacTouchBar(this);
m_touchbarActionWelcome = new QAction(QIcon(":/assets/images/wowllet.png"), "Welcome to WOWllet!");
m_touchbarActionWelcome = new QAction(QIcon(":/assets/images/wowlet.png"), "Welcome to WOWlet!");
m_touchbarWalletItems = {ui->actionSettings, ui->actionCalculator, ui->actionKeys, ui->actionDonate_to_Feather};
m_touchbarWizardItems = {m_touchbarActionWelcome};
#endif
@ -437,7 +437,7 @@ void MainWindow::initMenu() {
connect(ui->actionChange_restore_height, &QAction::triggered, this, &MainWindow::showRestoreHeightDialog);
connect(m_ctx, &AppContext::customRestoreHeightSet, [=](int height){
auto msg = QString("The restore height for this wallet has been set to %1. "
"Please re-open the wallet. WOWllet will now quit.").arg(height);
"Please re-open the wallet. WOWlet will now quit.").arg(height);
QMessageBox::information(this, "Cannot set custom restore height", msg);
this->menuQuitClicked();
});
@ -570,7 +570,7 @@ void MainWindow::onWalletOpenPasswordRequired(bool invalidPassword, const QStrin
void MainWindow::onWalletOpenedError(const QString &err) {
qDebug() << Q_FUNC_INFO << QString("Wallet open error: %1").arg(err);
QMessageBox::warning(this, "Wallet open error", err);
this->setWindowTitle("WOWllet");
this->setWindowTitle("WOWlet");
this->showWizard(WalletWizard::Page_OpenWallet);
this->touchbarShowWizard();
}
@ -1031,7 +1031,7 @@ void MainWindow::donateButtonClicked() {
if (donation <= 0)
donation = 0.1337;
ui->sendWidget->fill(m_ctx->donationAddress, "Donation to the WOWllet development team", donation);
ui->sendWidget->fill(m_ctx->donationAddress, "Donation to the WOWlet development team", donation);
ui->tabWidget->setCurrentIndex(Tabs::SEND);
}
@ -1171,14 +1171,14 @@ void MainWindow::showWalletCacheDebugDialog() {
void MainWindow::showNodeExhaustedMessage() {
// Spawning dialogs inside a lambda can cause system freezes on linux so we have to do it this way ¯\_(ツ)_/¯
auto msg = "WOWllet is in 'custom node connection mode' but could not "
auto msg = "WOWlet is in 'custom node connection mode' but could not "
"find an eligible node to connect to. Please go to Settings->Node "
"and enter a node manually.";
QMessageBox::warning(this, "Could not connect to a node", msg);
}
void MainWindow::showWSNodeExhaustedMessage() {
auto msg = "WOWllet is in 'automatic node connection mode' but the "
auto msg = "WOWlet is in 'automatic node connection mode' but the "
"websocket server returned no available nodes. Please go to Settings->Node "
"and enter a node manually.";
QMessageBox::warning(this, "Could not connect to a node", msg);
@ -1305,7 +1305,7 @@ void MainWindow::importTransaction() {
auto result = QMessageBox::warning(this, "Warning", "Using this feature may allow a remote node to associate the transaction with your IP address.\n"
"\n"
"Connect to a trusted node or run WOWllet over Tor if network level metadata leakage is included in your threat model.",
"Connect to a trusted node or run WOWlet over Tor if network level metadata leakage is included in your threat model.",
QMessageBox::Ok | QMessageBox::Cancel);
if (result == QMessageBox::Ok) {
auto *dialog = new TxImportDialog(this, m_ctx);

4
src/mainwindow.ui
View file

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>WOWllet</string>
<string>WOWlet</string>
</property>
<property name="windowIcon">
<iconset resource="assets.qrc">
@ -530,7 +530,7 @@
</action>
<action name="actionDonate_to_Feather">
<property name="text">
<string>Donate to WOWllet</string>
<string>Donate to WOWlet</string>
</property>
</action>
<action name="actionExport_CSV">

4
src/utils/config.cpp
View file

@ -113,7 +113,7 @@ Config::Config(QObject* parent)
QString appImagePath = qgetenv("APPIMAGE");
QFileInfo appImageDir(appImagePath);
QDir portablePath(appImageDir.absoluteDir().path() + "/.wowllet");
QDir portablePath(appImageDir.absoluteDir().path() + "/.wowlet");
if (portablePath.mkpath(".")) {
configPath = portablePath.path();
}
@ -122,7 +122,7 @@ Config::Config(QObject* parent)
}
}
configPath += "/.config/wowllet/settings.json";
configPath += "/.config/wowlet/settings.json";
init(QDir::toNativeSeparators(configPath));
}

4
src/utils/tails.cpp
View file

@ -55,9 +55,9 @@ void TailsOS::showDataPersistenceDisabledWarning()
msgBox.setText(QObject::tr("Warning: persistence disabled"));
msgBox.setWindowTitle(QObject::tr("Warning: persistence disabled"));
msgBox.setInformativeText(
QObject::tr("WOWllet has detected that Tails persistence is "
QObject::tr("WOWlet has detected that Tails persistence is "
"currently disabled. Any configurations and wallets you make inside "
"WOWllet will not be permanently saved."
"WOWlet will not be permanently saved."
"\n\n"
"Make sure to not save your wallet on the "
"filesystem, as it will be lost at shutdown."

2
src/utils/tor.cpp
View file

@ -44,7 +44,7 @@ Tor::Tor(AppContext *ctx, QObject *parent)
}
#ifndef HAS_TOR_BIN
qCritical() << "WOWllet built without embedded Tor. Assuming --use-local-tor";
qCritical() << "WOWlet built without embedded Tor. Assuming --use-local-tor";
this->localTor = true;
return;
#endif

8
src/utils/utils.cpp
View file

@ -261,9 +261,9 @@ QString Utils::getUnixAccountName() {
QString Utils::xdgDesktopEntry(){
return QString(
"[Desktop Entry]\n"
"Name=WOWllet\n"
"GenericName=WOWllet\n"
"X-GNOME-FullName=WOWllet\n"
"Name=WOWlet\n"
"GenericName=WOWlet\n"
"X-GNOME-FullName=WOWlet\n"
"Comment=a free Wownero desktop wallet\n"
"Keywords=Wownero;\n"
"Exec=\"%1\" %u\n"
@ -308,7 +308,7 @@ bool Utils::xdgDesktopEntryRegister() {
writeLocations += QString("- %1\n").arg(xdgPaths.pathApp);
writeLocations += QString("- %1\n").arg(xdgPaths.pathIcon);
QPixmap appIcon(":assets/images/wowllet.png");
QPixmap appIcon(":assets/images/wowlet.png");
if (!Utils::fileExists(xdgPaths.pathIcon))
Utils::pixmapWrite(xdgPaths.pathIcon, appIcon);
Utils::xdgDesktopEntryWrite(xdgPaths.pathApp);

2
src/utils/utils.h
View file

@ -33,7 +33,7 @@ struct xdgDesktopEntryPaths {
};
const xdgDesktopEntryPaths xdgPaths = {
QString("%1/wowllet.desktop").arg(QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation)),
QString("%1/wowlet.desktop").arg(QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation)),
QString("%1/.local/share/icons/wownero.png").arg(QDir::homePath()),
QString("/")
};

2
src/wizard/menu.cpp
View file

@ -14,7 +14,7 @@ MenuPage::MenuPage(AppContext *ctx, WalletKeysFilesModel *wallets, QWidget *pare
, m_walletKeysFilesModel(wallets)
{
ui->setupUi(this);
this->setTitle("Welcome to WOWllet");
this->setTitle("Welcome to WOWlet");
this->setButtonText(QWizard::FinishButton, "Open recent wallet");
}

4
src/wizard/network.cpp
View file

@ -11,11 +11,11 @@ NetworkPage::NetworkPage(AppContext *ctx, QWidget *parent) :
ui(new Ui::NetworkPage),
m_ctx(ctx) {
ui->setupUi(this);
this->setTitle("Welcome to WOWllet");
this->setTitle("Welcome to WOWlet");
ui->customFrame->hide();
QPixmap p(":assets/images/wowllet.png");
QPixmap p(":assets/images/wowlet.png");
ui->featherImage->setText("");
ui->featherImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation));
ui->label_eg->setText("Examples:\n- http://127.0.0.1:34568\n- my.node.com\n- my.node.com:34568\n- user:pass@my.node.com:34568");

2
src/wizard/walletwizard.cpp
View file

@ -19,7 +19,7 @@ WalletWizard::WalletWizard(AppContext *ctx, WalletWizard::Page startPage, QWidge
: QWizard(parent)
, m_ctx(ctx)
{
this->setWindowTitle("Welcome to WOWllet");
this->setWindowTitle("Welcome to WOWlet");
this->setWindowIcon(QIcon(":/assets/images/appicons/64x64.png"));
m_walletKeysFilesModel = new WalletKeysFilesModel(m_ctx, this);

6
utils/Info.plist
View file

@ -18,16 +18,16 @@
<string>????</string>
<key>CFBundleExecutable</key>
<string>wowllet</string>
<string>wowlet</string>
<key>CFBundleName</key>
<string>WOWllet</string>
<string>WOWlet</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014-2021 The Monero Project</string>
<key>CFBundleIdentifier</key>
<string>org.monero-project.wowllet</string>
<string>org.monero-project.wowlet</string>
<key>CFBundleVersion</key>
<string>@VERSION_LONG@</string>

10
utils/build_macos.sh
View file

@ -6,20 +6,20 @@ echo "[+] hash: $HASH"
export DRONE=true
echo "[+] Building"
rm ~/wowllet.zip 2>&1 >/dev/null
cd ~/wowllet
rm ~/wowlet.zip 2>&1 >/dev/null
cd ~/wowlet
git fetch
git reset --hard "$HASH"
git submodule update --init --depth 120 monero
git submodule update --init --depth 120 --recursive monero
cp "/Users/administrator/tor/libevent-2.1.7.dylib" "/Users/administrator/wowllet/src/assets/exec/libevent-2.1.7.dylib"
cp "/Users/administrator/tor/libevent-2.1.7.dylib" "/Users/administrator/wowlet/src/assets/exec/libevent-2.1.7.dylib"
CMAKE_PREFIX_PATH="~/Qt/5.15.1/clang_64" TOR_BIN="/Users/administrator/tor/tor" make -j3 mac-release
if [[ $? -eq 0 ]]; then
echo "[+] Feather built OK"
cd ~/wowllet/build/bin
zip -qr ~/wowllet.zip wowllet.app
cd ~/wowlet/build/bin
zip -qr ~/wowlet.zip wowlet.app
else
echo "[+] Error!"
exit 1;