Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
289f9ab1d2 | ||
|
|
73747e05a7 | ||
|
|
3051ce5118 | ||
|
|
fb32fa2fd2 | ||
|
|
b3eab6085f | ||
|
|
835aecb79d | ||
|
|
6cba5d0487 | ||
|
|
50b78cee51 | ||
|
|
1b6f648a0b | ||
|
|
6b2f8f847e | ||
|
|
917f8b5812 | ||
|
|
a62fb95fbf | ||
|
|
c3b0d00a72 | ||
|
|
d6dfd678b8 | ||
|
|
8b215c1e73 | ||
|
|
96295a52de | ||
|
|
ccd0e8e64b | ||
|
|
3b3ec89306 | ||
|
|
373fe8e02a | ||
|
|
14d9793193 | ||
|
|
65ceab6323 | ||
|
|
6b2118ecf6 | ||
|
|
ca78025735 | ||
|
|
c5eb13145f | ||
|
|
946443bf8c | ||
|
|
ae33c2f1b0 | ||
|
|
c97c0d597b | ||
|
|
ee3713b16b | ||
|
|
ae39e71061 |
@@ -1,10 +1,9 @@
|
||||
[submodule "contrib/KDMacTouchBar"]
|
||||
path = contrib/KDMacTouchBar
|
||||
url = https://github.com/KDAB/KDMacTouchBar.git
|
||||
[submodule "monero"]
|
||||
path = monero
|
||||
url = https://git.wownero.com/wownero/wownero
|
||||
branch = wowlet
|
||||
[submodule "contrib/quirc"]
|
||||
path = contrib/quirc
|
||||
url = https://github.com/dlbeer/quirc.git
|
||||
[submodule "wownero"]
|
||||
path = wownero
|
||||
url = https://git.wownero.com/wownero/wownero.git
|
||||
|
||||
@@ -4,15 +4,13 @@ project(wowlet)
|
||||
message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
|
||||
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
set(VERSION_MAJOR "2")
|
||||
set(VERSION_MAJOR "3")
|
||||
set(VERSION_MINOR "0")
|
||||
set(VERSION_REVISION "0")
|
||||
set(VERSION "beta-2")
|
||||
set(VERSION "beta-4")
|
||||
|
||||
option(FETCH_DEPS "Download dependencies if they are not found" ON)
|
||||
option(XMRIG "Include XMRig module" ON)
|
||||
option(OPENVR "Include OpenVR support")
|
||||
option(QML "Include QtQuick (QML)")
|
||||
option(ANDROID "Android deployment")
|
||||
option(ANDROID_DEBUG "View the Android app on desktop")
|
||||
option(TOR_BIN "Path to Tor binary to embed inside WOWlet")
|
||||
@@ -33,9 +31,6 @@ set(BUILD_GUI_DEPS ON)
|
||||
set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
|
||||
set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
|
||||
set(USE_SINGLE_BUILDDIR ON)
|
||||
if(OPENVR OR ANDROID_DEBUG)
|
||||
set(QML ON)
|
||||
endif()
|
||||
|
||||
# Are we in debug mode?
|
||||
set(_CMAKE_BUILD_TYPE "")
|
||||
@@ -57,7 +52,7 @@ if(STATIC)
|
||||
# manually set the unbound submodule the right commit that has the fix.
|
||||
# This only works with -DMANUAL_SUBMODULES=1
|
||||
message(STATUS "applying unbound static build fix contrib/unbound_static.patch")
|
||||
execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/monero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
|
||||
execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/wownero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
|
||||
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
set(Boost_USE_STATIC_RUNTIME ON)
|
||||
@@ -90,21 +85,19 @@ function (add_linker_flag_if_supported flag var)
|
||||
endfunction()
|
||||
|
||||
find_package(Git)
|
||||
if(GIT_FOUND)
|
||||
message(STATUS "Initializing submodules")
|
||||
execute_process(COMMAND git "submodule" "update" "--init" "--recursive")
|
||||
execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
|
||||
message(FATAL_ERROR "[submodule] Monero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}")
|
||||
else()
|
||||
message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}")
|
||||
endif()
|
||||
endif()
|
||||
#if(GIT_FOUND)
|
||||
# message(STATUS "Initializing submodules")
|
||||
# execute_process(COMMAND git "submodule" "update" "--init" "--recursive")
|
||||
# execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
# if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
|
||||
# message(FATAL_ERROR "[submodule] Wownero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}")
|
||||
# else()
|
||||
# message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}")
|
||||
# endif()
|
||||
#endif()
|
||||
|
||||
add_subdirectory(monero)
|
||||
set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
|
||||
get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
|
||||
get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY)
|
||||
add_subdirectory(wownero)
|
||||
get_directory_property(ARCH_WIDTH DIRECTORY "wownero" DEFINITION ARCH_WIDTH)
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
include(VersionMonero)
|
||||
|
||||
@@ -262,7 +262,7 @@ RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
|
||||
make -j$THREADS install && \
|
||||
rm -rf $(pwd)
|
||||
|
||||
RUN wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
|
||||
RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz && \
|
||||
echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" | sha256sum -c && \
|
||||
tar -xzf boost_1_73_0.tar.gz && \
|
||||
rm boost_1_73_0.tar.gz && \
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
|
||||
CMAKEFLAGS = \
|
||||
-DARCH=x86_64 \
|
||||
-DBUILD_64=On \
|
||||
-DBUILD_TESTS=Off \
|
||||
-DOPENVR=Off \
|
||||
@@ -43,7 +42,7 @@ CMAKEFLAGS = \
|
||||
$(CMAKEFLAGS_EXTRA)
|
||||
|
||||
release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
|
||||
release-static: CMAKEFLAGS += -DXMRIG=ON
|
||||
release-static: CMAKEFLAGS += -DXMRIG=OFF
|
||||
release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
|
||||
release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
|
||||
release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF)
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
[](https://ci.wownero.com/wowlet/wowlet)
|
||||
|
||||
# WOWlet- a free Wownero desktop wallet
|
||||
|
||||
WOWlet is a free, open-source Wownero client for Linux, Mac OS, and Windows.
|
||||
|
||||
WOWlet is a free, open-source Wownero client for Linux with ports for Mac OS and Windows.
|
||||

|
||||
|
||||
## Development resources
|
||||
|
||||
* Git: [git.wownero.com/wowlet/wowlet](https://git.wownero.com/wowlet/wowlet)
|
||||
* IRC: `#wownero` on Freenode
|
||||
* IRC: `#wownero-dev` on [OFTC](https://oftc.net/)
|
||||
* [Building WOWlet from source](https://git.wownero.com/wowlet/wowlet/src/branch/master/docs/BUILDING.md)
|
||||
* [Working on WOWlet](https://git.wownero.com/wowlet/wowlet/src/branch/master/docs/HACKING.md)
|
||||
|
||||
Copyright (c) 2020-2021 The Monero Project.
|
||||
|
||||
@@ -35,7 +35,7 @@ if(RET)
|
||||
message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
|
||||
set(VERSIONTAG "unknown")
|
||||
set(VERSION_IS_RELEASE "false")
|
||||
configure_file("monero/src/version.cpp.in" "${TO}")
|
||||
configure_file("wownero/src/version.cpp.in" "${TO}")
|
||||
else()
|
||||
string(SUBSTRING ${COMMIT} 0 9 COMMIT)
|
||||
message(STATUS "You are currently on commit ${COMMIT}")
|
||||
@@ -61,5 +61,5 @@ else()
|
||||
set(VERSION_IS_RELEASE "false")
|
||||
endif()
|
||||
endif()
|
||||
configure_file("monero/src/version.cpp.in" "${TO}")
|
||||
configure_file("wownero/src/version.cpp.in" "${TO}")
|
||||
endif()
|
||||
@@ -4,7 +4,7 @@
|
||||
find_package(Git QUIET)
|
||||
# Check what commit we're on
|
||||
execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
|
||||
|
||||
if(RET)
|
||||
# Something went wrong, set the version tag to -unknown
|
||||
@@ -37,7 +37,7 @@ endif()
|
||||
|
||||
# Check latest tagged release
|
||||
execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 RESULT_VARIABLE RET OUTPUT_VARIABLE TAG OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
|
||||
|
||||
if(RET)
|
||||
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
|
||||
|
||||
@@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo
|
||||
# Build deb package
|
||||
|
||||
dpkg-deb --build $DEBDIR
|
||||
mv wowlet.DebDir.deb wowlet_2.0_amd64.deb
|
||||
mv wowlet.DebDir.deb wowlet_2.1_amd64.deb
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Package: wowlet
|
||||
Version: 2.0
|
||||
Version: 2.1
|
||||
Section: net
|
||||
Priority: optional
|
||||
Architecture: amd64
|
||||
|
||||
@@ -27,7 +27,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea
|
||||
#### 2. Base image
|
||||
|
||||
```bash
|
||||
docker build --tag wowlet:linux --build-arg THREADS=4 .
|
||||
docker build --tag wowlet:linux --build-arg THREADS=6 .
|
||||
```
|
||||
|
||||
Building the base image takes a while. You only need to build the base image once.
|
||||
@@ -37,7 +37,7 @@ Building the base image takes a while. You only need to build the base image onc
|
||||
##### Standalone binary
|
||||
|
||||
```bash
|
||||
docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j4'
|
||||
docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j6'
|
||||
```
|
||||
|
||||
If you're re-running a build make sure to `rm -rf build/` first.
|
||||
@@ -67,7 +67,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea
|
||||
|
||||
|
||||
```bash
|
||||
docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=4 .
|
||||
docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=6 .
|
||||
```
|
||||
|
||||
Building the base image takes a while. You only need to build the base image once.
|
||||
@@ -75,7 +75,7 @@ Building the base image takes a while. You only need to build the base image onc
|
||||
#### 3. Build
|
||||
|
||||
```bash
|
||||
docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4'
|
||||
docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make windows root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j6'
|
||||
```
|
||||
|
||||
If you're re-running a build make sure to `rm -rf build/` first.
|
||||
@@ -96,13 +96,28 @@ Clone the repository.
|
||||
```bash
|
||||
git clone --recursive https://git.wownero.com/wowlet/wowlet.git
|
||||
```
|
||||
Download Qt5.15.1 from here:
|
||||
https://download.qt.io/archive/qt/5.15/5.15.1/single/
|
||||
and build Qt 5.15.1:
|
||||
|
||||
Get the latest LTS from here: https://www.qt.io/offline-installers and install.
|
||||
|
||||
Build WOWlet.
|
||||
Qt build on Mac OS:
|
||||
|
||||
```bash
|
||||
CMAKE_PREFIX_PATH=~/Qt5.15.1/5.15.1/clang_64 make mac-release
|
||||
cd ~/Downloads/qt-everywhere-src-5.15.1
|
||||
./configure -prefix $PWD/qtbase -release -nomake examples -nomake tests -skip qtwebchannel -skip qtpurchasing -skip webengine -skip qtwebview
|
||||
make -j 4
|
||||
```
|
||||
|
||||
Build WOWlet:
|
||||
|
||||
```bash
|
||||
CMAKE_PREFIX_PATH=/Users/$username/Downloads/qt-everywhere-src-5.15.1/qtbase/ make mac-release
|
||||
```
|
||||
|
||||
Install and start tor service for ticker/forums:
|
||||
```bash
|
||||
brew install tor
|
||||
brew services start tor
|
||||
```
|
||||
|
||||
The resulting Mac OS application can be found `build/bin/wowlet.app` and will **not** have Tor embedded.
|
||||
|
||||
@@ -2,14 +2,9 @@ set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
|
||||
# pthread
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
if(QML)
|
||||
# PNG
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
endif()
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
|
||||
# Compile these source files (.h/.cpp)
|
||||
file(GLOB SOURCE_FILES
|
||||
@@ -39,11 +34,7 @@ file(GLOB SOURCE_FILES
|
||||
"dialog/*.cpp"
|
||||
)
|
||||
|
||||
if(QML)
|
||||
find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Quick Qml QuickControls2 QmlImportScanner Multimedia)
|
||||
else()
|
||||
find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Multimedia)
|
||||
endif()
|
||||
find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Quick QuickWidgets Qml QuickControls2 QuickCompiler QmlImportScanner Multimedia)
|
||||
|
||||
if(OPENVR)
|
||||
# include some extra files
|
||||
@@ -136,10 +127,10 @@ file(GLOB_RECURSE SRC_HEADERS *.h)
|
||||
|
||||
target_include_directories(wowlet PUBLIC
|
||||
${CMAKE_BINARY_DIR}/src/wowlet_autogen/include
|
||||
${CMAKE_SOURCE_DIR}/monero/include
|
||||
${CMAKE_SOURCE_DIR}/monero/src
|
||||
${CMAKE_SOURCE_DIR}/monero/external/easylogging++
|
||||
${CMAKE_SOURCE_DIR}/monero/contrib/epee/include
|
||||
${CMAKE_SOURCE_DIR}/wownero/include
|
||||
${CMAKE_SOURCE_DIR}/wownero/src
|
||||
${CMAKE_SOURCE_DIR}/wownero/external/easylogging++
|
||||
${CMAKE_SOURCE_DIR}/wownero/contrib/epee/include
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/daemon
|
||||
@@ -172,10 +163,6 @@ if(TOR_BIN)
|
||||
target_compile_definitions(wowlet PRIVATE HAS_TOR_BIN=1)
|
||||
endif()
|
||||
|
||||
if(XMRIG)
|
||||
target_compile_definitions(wowlet PRIVATE HAS_XMRIG=1)
|
||||
endif()
|
||||
|
||||
if(ANDROID)
|
||||
target_compile_definitions(wowlet PRIVATE HAS_ANDROID=1)
|
||||
endif()
|
||||
@@ -216,10 +203,7 @@ endif()
|
||||
|
||||
target_compile_definitions(wowlet PUBLIC VR_API_PUBLIC)
|
||||
|
||||
if(QML)
|
||||
qt5_import_qml_plugins(${PROJECT_NAME})
|
||||
target_compile_definitions(wowlet PRIVATE HAS_QML=1)
|
||||
endif()
|
||||
qt5_import_qml_plugins(${PROJECT_NAME})
|
||||
|
||||
target_compile_definitions(wowlet
|
||||
PUBLIC
|
||||
@@ -251,44 +235,29 @@ endif()
|
||||
|
||||
# Link Wownero core libraries
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
wallet_merged
|
||||
${LMDB_LIBRARY}
|
||||
epee
|
||||
${UNBOUND_LIBRARY}
|
||||
${SODIUM_LIBRARY}
|
||||
wallet_api
|
||||
easylogging
|
||||
blockchain_db
|
||||
hardforks
|
||||
${Boost_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
${EXTRA_LIBRARIES})
|
||||
|
||||
# Link Qt libraries
|
||||
if(QML)
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
Qt5::Svg
|
||||
Qt5::QSvgPlugin
|
||||
Qt5::QSvgIconPlugin
|
||||
Qt5::Xml
|
||||
Qt5::WebSockets
|
||||
Qt5::Quick
|
||||
Qt5::Qml
|
||||
Qt5::QuickControls2)
|
||||
else()
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
Qt5::Svg
|
||||
Qt5::Xml
|
||||
Qt5::WebSockets)
|
||||
endif()
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
Qt5::Svg
|
||||
Qt5::QSvgPlugin
|
||||
Qt5::QSvgIconPlugin
|
||||
Qt5::Xml
|
||||
Qt5::WebSockets
|
||||
Qt5::Quick
|
||||
Qt5::Qml
|
||||
Qt5::QuickControls2
|
||||
Qt5::QuickWidgets)
|
||||
|
||||
if(ANDROID)
|
||||
# yolo some hardcoded paths
|
||||
@@ -392,9 +361,7 @@ message(STATUS "VERSION_MAJOR: ${VERSION_MAJOR}")
|
||||
message(STATUS "VERSION_MINOR: ${VERSION_MINOR}")
|
||||
message(STATUS "VERSION_REVISION: ${VERSION_REVISION}")
|
||||
message(STATUS "STATIC: ${STATIC}")
|
||||
message(STATUS "Include QtQuick (QML): ${QML}")
|
||||
message(STATUS "VERSION: ${VERSION}")
|
||||
message(STATUS "Include the XMRIG tab: ${XMRIG}")
|
||||
message(STATUS "Include Valve's OpenVR library: ${OPENVR}")
|
||||
message(STATUS "This build is for Android: ${ANDROID}")
|
||||
message(STATUS "This build is for testing the Android app on desktop: ${ANDROID_DEBUG}")
|
||||
|
||||
@@ -100,8 +100,21 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
|
||||
connect(this, &AppContext::nodeSourceChanged, this->nodes, &Nodes::onNodeSourceChanged);
|
||||
connect(this, &AppContext::setCustomNodes, this->nodes, &Nodes::setCustomNodes);
|
||||
|
||||
// Tor & socks proxy
|
||||
this->ws = new WSClient(this, wsUrl);
|
||||
// init backend URLs
|
||||
if(cmdargs->isSet("backend-host"))
|
||||
this->backendHost = cmdargs->value("backend-host");
|
||||
if(cmdargs->isSet("backend-host"))
|
||||
this->backendPort = cmdargs->value("backend-port").toUInt();
|
||||
if(cmdargs->isSet("backend-tls"))
|
||||
this->backendTLS = true;
|
||||
|
||||
backendWSUrl = this->backendTLS ? "wss://" : "ws://";
|
||||
backendWSUrl += QString("%1:%2").arg(this->backendHost).arg(this->backendPort);
|
||||
backendHTTPUrl = this->backendTLS ? "https://" : "http://";
|
||||
backendHTTPUrl += QString("%1:%2").arg(this->backendHost).arg(this->backendPort);
|
||||
|
||||
// init websocket client
|
||||
this->ws = new WSClient(this);
|
||||
connect(this->ws, &WSClient::WSMessage, this, &AppContext::onWSMessage);
|
||||
connect(this->ws, &WSClient::connectionEstablished, this, &AppContext::wsConnected);
|
||||
connect(this->ws, &WSClient::closed, this, &AppContext::wsDisconnected);
|
||||
@@ -150,10 +163,8 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
|
||||
AppContext::prices = new Prices();
|
||||
|
||||
// XMRig
|
||||
#ifdef HAS_XMRIG
|
||||
this->XMRig = new XmRig(this->configDirectory, this);
|
||||
this->XMRig->prepare();
|
||||
#endif
|
||||
|
||||
this->walletManager = WalletManager::instance();
|
||||
QString logPath = QString("%1/daemon.log").arg(configDirectory);
|
||||
@@ -171,17 +182,25 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
|
||||
|
||||
// libwallet connects
|
||||
connect(this->walletManager, &WalletManager::walletOpened, this, &AppContext::onWalletOpened);
|
||||
|
||||
// hideOnClose
|
||||
auto hideOnClose = config()->get(Config::hideOnClose).toBool();
|
||||
if(hideOnClose)
|
||||
QApplication::setQuitOnLastWindowClosed(false);
|
||||
}
|
||||
|
||||
void AppContext::initTor() {
|
||||
this->tor = new Tor(this, this);
|
||||
this->tor->start();
|
||||
|
||||
if (!isWhonix && wsUrl.contains(".onion")) {
|
||||
this->networkProxy = new QNetworkProxy(QNetworkProxy::Socks5Proxy, Tor::torHost, Tor::torPort);
|
||||
this->network->setProxy(*networkProxy);
|
||||
this->ws->webSocket.setProxy(*networkProxy);
|
||||
if (!isWhonix && !backendHost.contains(".onion")) {
|
||||
qDebug() << "'backend-host' did not contain '.onion' - running without Tor proxy.";
|
||||
return;
|
||||
}
|
||||
|
||||
this->networkProxy = new QNetworkProxy(QNetworkProxy::Socks5Proxy, Tor::torHost, Tor::torPort);
|
||||
this->network->setProxy(*networkProxy);
|
||||
this->ws->webSocket.setProxy(*networkProxy);
|
||||
}
|
||||
|
||||
void AppContext::initWS() {
|
||||
@@ -315,6 +334,7 @@ void AppContext::onPreferredFiatCurrencyChanged(const QString &symbol) {
|
||||
auto *model = this->currentWallet->transactionHistoryModel();
|
||||
if(model != nullptr) {
|
||||
model->preferredFiatSymbol = symbol;
|
||||
this->currentWallet->transactionHistoryModel()->transactionHistory()->calcFiatInfo();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -360,6 +380,13 @@ void AppContext::onWalletOpened(Wallet *wallet) {
|
||||
connect(this->currentWallet, &Wallet::heightRefreshed, this, &AppContext::onHeightRefreshed);
|
||||
connect(this->currentWallet, &Wallet::transactionCreated, this, &AppContext::onTransactionCreated);
|
||||
|
||||
this->currentWallet->historyModel(); // load historyModel
|
||||
auto *txHistory = this->currentWallet->history();
|
||||
txHistory->refresh(this->currentWallet->currentSubaddressAccount());
|
||||
|
||||
connect(AppContext::prices, &Prices::fiatPricesUpdated, txHistory, &TransactionHistory::calcFiatInfo);
|
||||
connect(AppContext::prices, &Prices::cryptoPricesUpdated, txHistory, &TransactionHistory::calcFiatInfo);
|
||||
|
||||
emit walletOpened(wallet);
|
||||
|
||||
connect(this->currentWallet, &Wallet::connectionStatusChanged, [this]{
|
||||
@@ -421,15 +448,19 @@ void AppContext::onWSMessage(const QJsonObject &msg) {
|
||||
if(changed)
|
||||
emit blockHeightWSUpdated(this->heights);
|
||||
}
|
||||
|
||||
else if(cmd == "yellwow") {
|
||||
this->yellowPagesData = msg.value("data").toArray();
|
||||
emit yellowUpdated();
|
||||
}
|
||||
else if(cmd == "rpc_nodes") {
|
||||
this->onWSNodes(msg.value("data").toArray());
|
||||
}
|
||||
#if defined(HAS_XMRIG)
|
||||
else if(cmd == "xmrig") {
|
||||
this->XMRigDownloads(msg.value("data").toObject());
|
||||
}
|
||||
#endif
|
||||
else if(cmd == "wownerod_releases") {
|
||||
emit WownerodDownloads(msg.value("data").toObject());
|
||||
}
|
||||
else if(cmd == "crypto_rates") {
|
||||
QJsonArray crypto_rates = msg.value("data").toArray();
|
||||
AppContext::prices->cryptoPricesReceived(crypto_rates);
|
||||
|
||||
@@ -66,7 +66,13 @@ public:
|
||||
QString defaultWalletDir;
|
||||
QString defaultWalletDirRoot;
|
||||
QString tmpTxDescription;
|
||||
QString wsUrl = "6wku2m4zrv6j666crlo7lzofv6ud6enzllyhou3ijeigpukymi37caad.onion";
|
||||
|
||||
// https://git.wownero.com/wowlet/wowlet-backend/
|
||||
QString backendHost = "6wku2m4zrv6j666crlo7lzofv6ud6enzllyhou3ijeigpukymi37caad.onion";
|
||||
unsigned int backendPort = 80;
|
||||
bool backendTLS = false;
|
||||
QString backendWSUrl;
|
||||
QString backendHTTPUrl;
|
||||
|
||||
QString walletPath;
|
||||
QString walletPassword = "";
|
||||
@@ -106,6 +112,7 @@ public:
|
||||
static QMap<QString, QString> txDescriptionCache;
|
||||
static QMap<QString, QString> txCache;
|
||||
static TxFiatHistory *txFiatHistory;
|
||||
QJsonArray yellowPagesData;
|
||||
QJsonObject versionPending;
|
||||
|
||||
// libwalletqt
|
||||
@@ -205,8 +212,10 @@ signals:
|
||||
void nodesUpdated(QList<QSharedPointer<WowletNode>> &nodes);
|
||||
void ccsUpdated(QList<QSharedPointer<CCSEntry>> &entries);
|
||||
void suchWowUpdated(const QJsonArray &such_data);
|
||||
void yellowUpdated();
|
||||
void nodeSourceChanged(NodeSource nodeSource);
|
||||
void XMRigDownloads(const QJsonObject &data);
|
||||
void WownerodDownloads(const QJsonObject &data);
|
||||
void pinLookupReceived(QString address, QString pin);
|
||||
void pinLookupErrorReceived();
|
||||
void pinReceived(QString pin);
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
<file>assets/images/confirmed.svg</file>
|
||||
<file>assets/images/connect.svg</file>
|
||||
<file>assets/images/copy.png</file>
|
||||
<file>assets/images/dog_running.gif</file>
|
||||
<file>assets/images/dog_sitting.gif</file>
|
||||
<file>assets/images/edit.png</file>
|
||||
<file>assets/images/exchange.png</file>
|
||||
<file>assets/images/exchange_white.png</file>
|
||||
@@ -37,6 +39,7 @@
|
||||
<file>assets/images/eye_blind.png</file>
|
||||
<file>assets/images/wowlet.png</file>
|
||||
<file>assets/images/file.png</file>
|
||||
<file>assets/images/fire.png</file>
|
||||
<file>assets/images/gnome-calc.png</file>
|
||||
<file>assets/images/history.png</file>
|
||||
<file>assets/images/info.png</file>
|
||||
@@ -225,5 +228,31 @@
|
||||
<file>assets/images/zoom.png</file>
|
||||
<file>assets/mnemonic_25_english.txt</file>
|
||||
<file>assets/restore_heights_wownero_mainnet.txt</file>
|
||||
|
||||
<file alias="mining/bottom_center_console.png">assets/images/mining/bottom_center_console.png</file>
|
||||
<file alias="mining/intel.png">assets/images/mining/intel.png</file>
|
||||
<file alias="mining/amd.png">assets/images/mining/amd.png</file>
|
||||
<file alias="mining/lowerleft_circle.png">assets/images/mining/lowerleft_circle.png</file>
|
||||
<file alias="mining/lowerleft.png">assets/images/mining/lowerleft.png</file>
|
||||
<file alias="mining/lower_repeat.png">assets/images/mining/lower_repeat.png</file>
|
||||
<file alias="mining/lowerright.png">assets/images/mining/lowerright.png</file>
|
||||
<file alias="mining/r_bottom.png">assets/images/mining/r_bottom.png</file>
|
||||
<file alias="mining/r_left.png">assets/images/mining/r_left.png</file>
|
||||
<file alias="mining/r_right.png">assets/images/mining/r_right.png</file>
|
||||
<file alias="mining/topleft.png">assets/images/mining/topleft.png</file>
|
||||
<file alias="mining/topright_bar.png">assets/images/mining/topright_bar.png</file>
|
||||
<file alias="mining/topright_left.png">assets/images/mining/topright_left.png</file>
|
||||
<file alias="mining/topright_middle.png">assets/images/mining/topright_middle.png</file>
|
||||
<file alias="mining/topright_right.png">assets/images/mining/topright_right.png</file>
|
||||
<file alias="mining/warning.png">assets/images/mining/warning.png</file>
|
||||
<file alias="mining/axe.png">assets/images/mining/axe.png</file>
|
||||
<file alias="mining/lowerleft_btn.png">assets/images/mining/lowerleft_btn.png</file>
|
||||
<file alias="mining/elmo.gif">assets/images/mining/elmo.gif</file>
|
||||
<file alias="mining/bubble.png">assets/images/mining/bubble.png</file>
|
||||
<file alias="mining/mining.webp">assets/images/mining/mining.webp</file>
|
||||
|
||||
<file alias="fonts/ComicMono.ttf">assets/fonts/ComicMono.ttf</file>
|
||||
<file alias="fonts/ComicMono-Bold.ttf">assets/fonts/ComicMono-Bold.ttf</file>
|
||||
<file alias="mining.qml">ui/qml/mining.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 9.0 KiB |
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 148 KiB |
@@ -32,17 +32,26 @@ ContactsWidget::ContactsWidget(QWidget *parent) :
|
||||
this->newContact();
|
||||
});
|
||||
|
||||
// row context menu
|
||||
m_rowMenu = new QMenu(ui->contacts);
|
||||
m_rowMenu->addAction(QIcon(":/assets/images/copy.png"), "Copy address", this, &ContactsWidget::copyAddress);
|
||||
m_rowMenu->addAction(QIcon(":/assets/images/copy.png"), "Copy name", this, &ContactsWidget::copyName);
|
||||
m_rowMenu->addAction("Pay to", this, &ContactsWidget::payTo);
|
||||
m_rowMenu->addAction("Delete", this, &ContactsWidget::deleteContact);
|
||||
connect(ui->btn_addContact, &QPushButton::pressed, [this]{
|
||||
this->newContact();
|
||||
});
|
||||
|
||||
connect(ui->contacts, &QTreeView::customContextMenuRequested, [=](const QPoint & point){
|
||||
QModelIndex index = ui->contacts->indexAt(point);
|
||||
if (index.isValid()) {
|
||||
auto username = index.model()->data(index.siblingAtColumn(AddressBookModel::Description), Qt::UserRole).toString();
|
||||
|
||||
m_rowMenu = new QMenu(ui->contacts);
|
||||
if(username.contains("(yp)"))
|
||||
m_rowMenu->addAction(QIcon(":/assets/images/network.png"), "Visit user's YellWOWPage", this, &ContactsWidget::visitYellowPage);
|
||||
|
||||
m_rowMenu->addAction(QIcon(":/assets/images/copy.png"), "Copy address", this, &ContactsWidget::copyAddress);
|
||||
m_rowMenu->addAction(QIcon(":/assets/images/copy.png"), "Copy name", this, &ContactsWidget::copyName);
|
||||
m_rowMenu->addAction("Pay to", this, &ContactsWidget::payTo);
|
||||
m_rowMenu->addAction("Delete", this, &ContactsWidget::deleteContact);
|
||||
|
||||
m_rowMenu->exec(ui->contacts->viewport()->mapToGlobal(point));
|
||||
m_rowMenu->deleteLater();
|
||||
}
|
||||
else {
|
||||
m_contextMenu->exec(ui->contacts->viewport()->mapToGlobal(point));
|
||||
@@ -52,6 +61,68 @@ ContactsWidget::ContactsWidget(QWidget *parent) :
|
||||
connect(ui->search, &QLineEdit::textChanged, this, &ContactsWidget::setSearchFilter);
|
||||
}
|
||||
|
||||
QMap<QString, QString> ContactsWidget::data() {
|
||||
auto rtn = QMap<QString, QString>();
|
||||
for (int i = 0; i < m_ctx->currentWallet->addressBook()->count(); i++) {
|
||||
m_ctx->currentWallet->addressBook()->getRow(i, [&rtn](const AddressBookInfo &entry) {
|
||||
rtn[entry.description()] = entry.address();
|
||||
});
|
||||
}
|
||||
return rtn;
|
||||
}
|
||||
|
||||
unsigned int ContactsWidget::rowIndex(const QString &name) {
|
||||
// name -> row index lookup
|
||||
int result = -1;
|
||||
for (int i = 0; i < m_ctx->currentWallet->addressBook()->count(); i++) {
|
||||
m_ctx->currentWallet->addressBook()->getRow(i, [i, name, &result](const AddressBookInfo &entry) {
|
||||
if(entry.description() == name) result = i;
|
||||
return;
|
||||
});
|
||||
|
||||
if(result != -1)
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void ContactsWidget::loadYellowPages() {
|
||||
if (m_ctx->currentWallet == nullptr || m_ctx->yellowPagesData.empty())
|
||||
return;
|
||||
|
||||
auto contacts = this->data();
|
||||
for (auto item: m_ctx->yellowPagesData) {
|
||||
auto obj = item.toObject();
|
||||
const auto username = QString("%1 (yp)").arg(obj.value("username").toString());
|
||||
const auto address = obj.value("address").toString();
|
||||
|
||||
if(contacts.contains(username)) {
|
||||
if(contacts[username] == address) continue;
|
||||
|
||||
// update the address
|
||||
auto idx = this->rowIndex(username);
|
||||
if(idx == -1) continue;
|
||||
m_model->deleteRow((int)idx);
|
||||
}
|
||||
|
||||
bool addressValid = WalletManager::addressValid(address, m_ctx->currentWallet->nettype());
|
||||
if (!addressValid) {
|
||||
continue;
|
||||
}
|
||||
|
||||
m_ctx->currentWallet->addressBook()->addRow(address, "", username);
|
||||
}
|
||||
}
|
||||
|
||||
void ContactsWidget::visitYellowPage() {
|
||||
auto index = ui->contacts->currentIndex();
|
||||
auto username = index.model()->data(
|
||||
index.siblingAtColumn(AddressBookModel::Description),
|
||||
Qt::UserRole).toString();
|
||||
username = username.replace(" (yp)", "").trimmed();
|
||||
Utils::externalLinkWarning(this, QString("https://yellow.wownero.com/user/%1").arg(username));
|
||||
}
|
||||
|
||||
void ContactsWidget::copyAddress() {
|
||||
QModelIndex index = ui->contacts->currentIndex();
|
||||
ModelUtils::copyColumn(&index, AddressBookModel::Address);
|
||||
|
||||
@@ -22,6 +22,7 @@ class ContactsWidget : public QWidget
|
||||
public:
|
||||
explicit ContactsWidget(QWidget *parent = nullptr);
|
||||
void setModel(AddressBookModel * model);
|
||||
QMap<QString, QString> data();
|
||||
~ContactsWidget() override;
|
||||
|
||||
public slots:
|
||||
@@ -30,9 +31,11 @@ public slots:
|
||||
void payTo();
|
||||
void newContact(QString address = "", QString name = "");
|
||||
void deleteContact();
|
||||
void visitYellowPage();
|
||||
void setShowFullAddresses(bool show);
|
||||
void setSearchFilter(const QString &filter);
|
||||
void resetModel();
|
||||
void loadYellowPages();
|
||||
|
||||
signals:
|
||||
void fillAddress(QString &address);
|
||||
@@ -50,6 +53,8 @@ private:
|
||||
QMenu *m_headerMenu;
|
||||
AddressBookModel * m_model;
|
||||
AddressBookProxyModel * m_proxyModel;
|
||||
|
||||
unsigned int rowIndex(const QString &name);
|
||||
};
|
||||
|
||||
#endif // CONTACTSWIDGET_H
|
||||
|
||||
@@ -6,17 +6,14 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>589</width>
|
||||
<height>416</height>
|
||||
<width>310</width>
|
||||
<height>283</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
@@ -29,14 +26,38 @@
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="search">
|
||||
<property name="placeholderText">
|
||||
<string>Search contacts...</string>
|
||||
<property name="verticalSpacing">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="spacing">
|
||||
<number>9</number>
|
||||
</property>
|
||||
</widget>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="search">
|
||||
<property name="placeholderText">
|
||||
<string>Search contacts...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="line">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_addContact">
|
||||
<property name="text">
|
||||
<string>New contact</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QTreeView" name="contacts">
|
||||
<property name="rootIsDecorated">
|
||||
<bool>false</bool>
|
||||
|
||||
@@ -50,6 +50,7 @@ void DebugInfoDialog::updateInfo() {
|
||||
ui->label_synchronized->setText(m_ctx->currentWallet->synchronized() ? "True" : "False");
|
||||
|
||||
auto node = m_ctx->nodes->connection();
|
||||
ui->label_websocketURL->setText(m_ctx->backendWSUrl);
|
||||
ui->label_remoteNode->setText(node.full);
|
||||
ui->label_walletStatus->setText(this->statusToString(m_ctx->currentWallet->connectionStatus()));
|
||||
ui->label_torStatus->setText(torStatus);
|
||||
@@ -101,6 +102,7 @@ void DebugInfoDialog::copyToClipboad() {
|
||||
text += QString("Remote node: %1 \n").arg(ui->label_remoteNode->text());
|
||||
text += QString("Wallet status: %1 \n").arg(ui->label_walletStatus->text());
|
||||
text += QString("Tor status: %1 \n").arg(ui->label_torStatus->text());
|
||||
text += QString("Websocket URL: %1 \n").arg(ui->label_websocketURL->text());
|
||||
text += QString("Websocket status: %1 \n").arg(ui->label_websocketStatus->text());
|
||||
|
||||
text += QString("Network type: %1 \n").arg(ui->label_netType->text());
|
||||
|
||||
@@ -183,14 +183,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0">
|
||||
<item row="13" column="0">
|
||||
<widget class="QLabel" name="label_19">
|
||||
<property name="text">
|
||||
<string>Websocket status:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="1">
|
||||
<item row="13" column="1">
|
||||
<widget class="QLabel" name="label_websocketStatus">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -200,21 +200,21 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="1">
|
||||
<item row="14" column="1">
|
||||
<widget class="Line" name="line_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="0">
|
||||
<item row="15" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Network type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="14" column="1">
|
||||
<item row="15" column="1">
|
||||
<widget class="QLabel" name="label_netType">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -224,14 +224,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="0">
|
||||
<item row="16" column="0">
|
||||
<widget class="QLabel" name="label_23">
|
||||
<property name="text">
|
||||
<string>Seed type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="1">
|
||||
<item row="16" column="1">
|
||||
<widget class="QLabel" name="label_seedType">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -241,14 +241,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="16" column="0">
|
||||
<item row="17" column="0">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
<string>View only:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="16" column="1">
|
||||
<item row="17" column="1">
|
||||
<widget class="QLabel" name="label_viewOnly">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -258,14 +258,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="20" column="0">
|
||||
<item row="21" column="0">
|
||||
<widget class="QLabel" name="label_24">
|
||||
<property name="text">
|
||||
<string>Timestamp:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="20" column="1">
|
||||
<item row="21" column="1">
|
||||
<widget class="QLabel" name="label_timestamp">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -275,14 +275,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="19" column="0">
|
||||
<item row="20" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Operating system:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="19" column="1">
|
||||
<item row="20" column="1">
|
||||
<widget class="QLabel" name="label_OS">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
@@ -292,7 +292,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="18" column="1">
|
||||
<item row="19" column="1">
|
||||
<widget class="Line" name="line_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
@@ -316,20 +316,34 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="17" column="1">
|
||||
<item row="18" column="1">
|
||||
<widget class="QLabel" name="label_primaryOnly">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="17" column="0">
|
||||
<item row="18" column="0">
|
||||
<widget class="QLabel" name="label_11">
|
||||
<property name="text">
|
||||
<string>Primary only:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
<string>Websocket URL:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="1">
|
||||
<widget class="QLabel" name="label_websocketURL">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
@@ -9,6 +9,23 @@
|
||||
namespace globals
|
||||
{
|
||||
const qreal cdiv = 1e11;
|
||||
|
||||
enum Tabs {
|
||||
HOME = 0,
|
||||
HISTORY,
|
||||
SEND,
|
||||
RECEIVE,
|
||||
COINS,
|
||||
CALC,
|
||||
XMRIG
|
||||
};
|
||||
|
||||
enum TabsHome {
|
||||
FORUM,
|
||||
REDDIT,
|
||||
SUCHWOW,
|
||||
WFS
|
||||
};
|
||||
}
|
||||
|
||||
#endif //WOWLET_GLOBALS_H
|
||||
|
||||
@@ -32,6 +32,12 @@ TransactionInfo* TransactionHistory::transaction(const QString &id)
|
||||
return itr != m_tinfo.end() ? *itr : nullptr;
|
||||
}
|
||||
|
||||
void TransactionHistory::calcFiatInfo() {
|
||||
for(const auto &tx: m_tinfo) {
|
||||
tx->calcFiatInfo();
|
||||
}
|
||||
}
|
||||
|
||||
void TransactionHistory::refresh(quint32 accountIndex)
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
||||
|
||||
@@ -39,6 +39,9 @@ public:
|
||||
quint64 minutesToUnlock() const;
|
||||
bool locked() const;
|
||||
|
||||
public slots:
|
||||
void calcFiatInfo();
|
||||
|
||||
signals:
|
||||
void refreshStarted() const;
|
||||
void refreshFinished() const;
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
#include "libwalletqt/WalletManager.h"
|
||||
#include "Transfer.h"
|
||||
#include "Ring.h"
|
||||
#include "globals.h"
|
||||
#include "appcontext.h"
|
||||
|
||||
TransactionInfo::Direction TransactionInfo::direction() const
|
||||
{
|
||||
@@ -109,6 +111,21 @@ QDateTime TransactionInfo::timestamp() const
|
||||
return m_timestamp;
|
||||
}
|
||||
|
||||
QString TransactionInfo::currentPriceStr() const
|
||||
{
|
||||
return m_currentPriceStr;
|
||||
}
|
||||
|
||||
QString TransactionInfo::historicalRateStr() const
|
||||
{
|
||||
return m_historicalRateStr;
|
||||
}
|
||||
|
||||
QString TransactionInfo::historicalPriceStr() const
|
||||
{
|
||||
return m_historicalPriceStr;
|
||||
}
|
||||
|
||||
QString TransactionInfo::date() const
|
||||
{
|
||||
return timestamp().date().toString(Qt::ISODate);
|
||||
@@ -161,6 +178,37 @@ QString TransactionInfo::rings_formatted() const
|
||||
return rings;
|
||||
}
|
||||
|
||||
void TransactionInfo::calcFiatInfo() {
|
||||
auto const hash = this->hash();
|
||||
auto timestamp = this->timestamp().toString("yyyyMMdd");
|
||||
|
||||
if(!AppContext::prices->markets.contains("WOW"))
|
||||
return;
|
||||
|
||||
double fiat_rate = AppContext::prices->markets["WOW"].price_usd;
|
||||
double historical_fiat_rate = AppContext::txFiatHistory->get(timestamp);
|
||||
if (historical_fiat_rate == 0.0)
|
||||
return;
|
||||
|
||||
auto const preferredFiat = config()->get(Config::preferredFiatCurrency).toString();
|
||||
|
||||
if(preferredFiat != "USD") {
|
||||
historical_fiat_rate = AppContext::prices->convert(
|
||||
"USD", preferredFiat, historical_fiat_rate);
|
||||
fiat_rate = AppContext::prices->convert(
|
||||
"USD", preferredFiat, fiat_rate);
|
||||
}
|
||||
|
||||
double balance = (this->balanceDelta() / globals::cdiv);
|
||||
|
||||
m_historicalRate = historical_fiat_rate;
|
||||
m_historicalPrice = historical_fiat_rate * balance;
|
||||
m_currentPrice = fiat_rate * balance;
|
||||
m_historicalPriceStr = Utils::amountToCurrencyString(m_historicalPrice, preferredFiat, 2);
|
||||
m_historicalRateStr = Utils::amountToCurrencyString(m_historicalRate, preferredFiat, 5);
|
||||
m_currentPriceStr = Utils::amountToCurrencyString(m_currentPrice, preferredFiat, 2);
|
||||
}
|
||||
|
||||
TransactionInfo::TransactionInfo(const Monero::TransactionInfo *pimpl, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_amount(pimpl->amount())
|
||||
@@ -193,4 +241,6 @@ TransactionInfo::TransactionInfo(const Monero::TransactionInfo *pimpl, QObject *
|
||||
{
|
||||
m_subaddrIndex.insert(i);
|
||||
}
|
||||
|
||||
this->calcFiatInfo();
|
||||
}
|
||||
|
||||
@@ -71,6 +71,9 @@ public:
|
||||
QDateTime timestamp() const;
|
||||
QString date() const;
|
||||
QString time() const;
|
||||
QString currentPriceStr() const;
|
||||
QString historicalRateStr() const;
|
||||
QString historicalPriceStr() const;
|
||||
QString paymentId() const;
|
||||
//! only applicable for output transactions
|
||||
//! used in tx details popup
|
||||
@@ -79,6 +82,9 @@ public:
|
||||
QList<Transfer*> transfers() const;
|
||||
QString rings_formatted() const;
|
||||
|
||||
public slots:
|
||||
void calcFiatInfo();
|
||||
|
||||
private:
|
||||
explicit TransactionInfo(const Monero::TransactionInfo *pimpl, QObject *parent = nullptr);
|
||||
private:
|
||||
@@ -102,6 +108,14 @@ private:
|
||||
QDateTime m_timestamp;
|
||||
quint64 m_unlockTime;
|
||||
bool m_coinbase;
|
||||
|
||||
double m_historicalPrice = 0.0;
|
||||
double m_historicalRate = 0.0;
|
||||
double m_currentPrice = 0.0;
|
||||
|
||||
QString m_currentPriceStr = "?";
|
||||
QString m_historicalRateStr = "?";
|
||||
QString m_historicalPriceStr = "?";
|
||||
};
|
||||
|
||||
#endif // TRANSACTIONINFO_H
|
||||
|
||||
@@ -31,6 +31,7 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
Q_INIT_RESOURCE(assets);
|
||||
qputenv("QML_DISABLE_DISK_CACHE", "1");
|
||||
|
||||
#if defined(Q_OS_MAC) && defined(HAS_TOR_BIN)
|
||||
Q_INIT_RESOURCE(assets_tor_macos);
|
||||
@@ -107,6 +108,15 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||
QCommandLineOption androidDebugOption(QStringList() << "android-debug", "Start the Android interface without actually running on Android - for debugging purposes. Requires -DANDROID_DEBUG=ON CMake definition.");
|
||||
parser.addOption(androidDebugOption);
|
||||
|
||||
QCommandLineOption backendHostOption(QStringList() << "backend-host", "specify your own `wowlet-backend` host", "backend-host");
|
||||
parser.addOption(backendHostOption);
|
||||
|
||||
QCommandLineOption backendPortOption(QStringList() << "backend-port", "specify your own `wowlet-backend` port", "backend-port");
|
||||
parser.addOption(backendPortOption);
|
||||
|
||||
QCommandLineOption backendTLS(QStringList() << "backend-tls", "`wowlet-backend` is running via TLS? 'wss://' and 'https://' will be used.", "backend-tls");
|
||||
parser.addOption(backendTLS);
|
||||
|
||||
auto parsed = parser.parse(argv_);
|
||||
if(!parsed) {
|
||||
qCritical() << parser.errorText();
|
||||
@@ -131,21 +141,15 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||
#endif
|
||||
qRegisterMetaType<QVector<QString>>();
|
||||
|
||||
#ifdef HAS_QML
|
||||
qputenv("QML_DISABLE_DISK_CACHE", "1");
|
||||
#endif
|
||||
|
||||
#ifdef __ANDROID__
|
||||
if(android || androidDebug) {
|
||||
#ifndef HAS_QML
|
||||
qCritical() << "Wowlet compiled without QML support. Try -DQML=ON";
|
||||
return 1;
|
||||
#endif
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QGuiApplication mobile_app(argc, argv);
|
||||
auto *ctx = new AppContext(&parser);
|
||||
auto *mobile = new mobile::Mobile(ctx, &parser, &mobile_app);
|
||||
return mobile_app.exec();
|
||||
}
|
||||
#endif
|
||||
|
||||
if(openVREnabled) {
|
||||
#ifdef HAS_OPENVR
|
||||
|
||||
@@ -93,8 +93,8 @@ 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/wowlet/wowlet/issues\" style=\"color: #33A4DF\">https://git.wownero.com/wowlet/wowlet/issues</a><br/><br/>"
|
||||
"<body>Please report any bugs as issues on the forum:<br>\n"
|
||||
"<a href=\"https://forum.wownero.com\" style=\"color: #33A4DF\">https://forum.wownero.com/</a><br/><br/>"
|
||||
"\n"
|
||||
"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. "
|
||||
@@ -108,11 +108,14 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
m_trayIcon = new QSystemTrayIcon(QIcon(":/assets/images/appicons/64x64.png"));
|
||||
m_trayIcon->show();
|
||||
|
||||
m_trayActionHome = new QAction("Show", this);
|
||||
m_trayActionHome->setStatusTip("Show");
|
||||
|
||||
m_trayActionCalc = new QAction("Calc", this);
|
||||
m_trayActionCalc->setStatusTip("Calculator");
|
||||
|
||||
m_trayActionSend = new QAction("Send", this);
|
||||
m_trayActionSend->setStatusTip("Send WOW payment");
|
||||
m_trayActionSend->setStatusTip("Send a WOW payment");
|
||||
|
||||
m_trayActionHistory = new QAction("History", this);
|
||||
m_trayActionHistory->setStatusTip("View incoming transfers");
|
||||
@@ -120,6 +123,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
m_trayActionExit = new QAction("Quit", this);
|
||||
m_trayActionExit->setStatusTip("Exit application");
|
||||
|
||||
m_trayMenu.addAction(m_trayActionHome);
|
||||
m_trayMenu.addAction(m_trayActionSend);
|
||||
m_trayMenu.addAction(m_trayActionHistory);
|
||||
m_trayMenu.addAction(m_trayActionCalc);
|
||||
@@ -127,6 +131,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
m_trayIcon->setContextMenu(&m_trayMenu);
|
||||
|
||||
// @TODO: only init tray *after* boot
|
||||
connect(m_trayActionHome, &QAction::triggered, this, &MainWindow::showHomeWindow);
|
||||
connect(m_trayActionCalc, &QAction::triggered, this, &MainWindow::showCalcWindow);
|
||||
connect(m_trayActionSend, &QAction::triggered, this, &MainWindow::showSendTab);
|
||||
connect(m_trayActionHistory, &QAction::triggered, this, &MainWindow::showHistoryTab);
|
||||
@@ -166,22 +171,25 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
connect(m_ctx->nodes, &Nodes::WSNodeExhausted, this, &MainWindow::showWSNodeExhaustedMessage);
|
||||
|
||||
// XMRig
|
||||
#ifdef HAS_XMRIG
|
||||
m_xmrig = new XMRigWidget(m_ctx, this);
|
||||
ui->xmrRigLayout->addWidget(m_xmrig);
|
||||
connect(m_ctx->XMRig, &XmRig::output, m_xmrig, &XMRigWidget::onProcessOutput);
|
||||
connect(m_ctx->XMRig, &XmRig::error, m_xmrig, &XMRigWidget::onProcessError);
|
||||
connect(m_ctx->XMRig, &XmRig::output, m_xmrig, &XMRigWidget::daemonOutput);
|
||||
connect(m_ctx->XMRig, &XmRig::error, m_xmrig, &XMRigWidget::daemonOutput);
|
||||
connect(m_ctx->XMRig, &XmRig::blockReward, m_xmrig, &XMRigWidget::onBlockReward);
|
||||
connect(m_ctx->XMRig, &XmRig::hashrate, m_xmrig, &XMRigWidget::onHashrate);
|
||||
connect(m_ctx->XMRig, &XmRig::daemonStateChanged, m_xmrig, &XMRigWidget::onDaemonStateChanged);
|
||||
connect(m_ctx->XMRig, &XmRig::syncStatus, m_xmrig, &XMRigWidget::onSyncStatus);
|
||||
connect(m_ctx->XMRig, &XmRig::uptimeChanged, m_xmrig, &XMRigWidget::onUptimeChanged);
|
||||
connect(m_ctx->XMRig, &XmRig::daemonStateChanged, [=](DaemonMiningState state) {
|
||||
m_ctx->setWindowTitle(state >= DaemonMiningState::mining);
|
||||
});
|
||||
|
||||
connect(m_ctx, &AppContext::walletClosed, m_xmrig, &XMRigWidget::onWalletClosed);
|
||||
connect(m_ctx, &AppContext::walletOpened, m_xmrig, &XMRigWidget::onWalletOpened);
|
||||
connect(m_ctx, &AppContext::XMRigDownloads, m_xmrig, &XMRigWidget::onDownloads);
|
||||
|
||||
connect(m_xmrig, &XMRigWidget::miningStarted, [=]{ m_ctx->setWindowTitle(true); });
|
||||
connect(m_xmrig, &XMRigWidget::miningEnded, [=]{ m_ctx->setWindowTitle(false); });
|
||||
#else
|
||||
ui->tabWidget->setTabVisible(Tabs::XMRIG, false);
|
||||
#endif
|
||||
connect(m_ctx, &AppContext::XMRigDownloads, m_xmrig, &XMRigWidget::onRigDownloads);
|
||||
connect(m_ctx, &AppContext::WownerodDownloads, m_xmrig, &XMRigWidget::onWownerodDownloads);
|
||||
|
||||
connect(ui->ccsWidget, &CCSWidget::selected, this, &MainWindow::showSendScreen);
|
||||
connect(m_ctx, &AppContext::ccsUpdated, ui->ccsWidget->model(), &CCSModel::updateEntries);
|
||||
@@ -192,8 +200,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
|
||||
connect(ui->redditWidget, &RedditWidget::setStatusText, this, &MainWindow::setStatusText);
|
||||
|
||||
connect(ui->tabWidget, &QTabWidget::currentChanged, m_xmrig, &XMRigWidget::onMenuTabChanged);
|
||||
connect(ui->tabHomeWidget, &QTabWidget::currentChanged, [](int index){
|
||||
config()->set(Config::homeWidget, TabsHome(index));
|
||||
config()->set(Config::homeWidget, globals::TabsHome(index));
|
||||
});
|
||||
|
||||
connect(m_ctx, &AppContext::donationNag, [=]{
|
||||
@@ -273,6 +282,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
|
||||
// settings connects
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateFiatBalanceWidget);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateWowWidget);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateBTCWidget);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateXMRWidget);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, m_ctx, &AppContext::onPreferredFiatCurrencyChanged);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, ui->suchWowWidget, &SuchWowWidget::onPreferredFiatCurrencyChanged);
|
||||
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, ui->sendWidget, QOverload<>::of(&SendWidget::onPreferredFiatCurrencyChanged));
|
||||
@@ -292,7 +304,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
});
|
||||
connect(ui->receiveWidget, &ReceiveWidget::showTransactions, [this](const QString &text) {
|
||||
ui->historyWidget->setSearchText(text);
|
||||
ui->tabWidget->setCurrentIndex(Tabs::HISTORY);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::HISTORY);
|
||||
});
|
||||
|
||||
// History
|
||||
@@ -303,6 +315,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
|
||||
// Contacts
|
||||
connect(ui->contactWidget, &ContactsWidget::fillAddress, ui->sendWidget, &SendWidget::fillAddress);
|
||||
connect(m_ctx, &AppContext::yellowUpdated, ui->contactWidget, &ContactsWidget::loadYellowPages);
|
||||
|
||||
// Open alias
|
||||
connect(ui->sendWidget, &SendWidget::resolveOpenAlias, m_ctx, &AppContext::onOpenAliasResolve);
|
||||
@@ -328,9 +341,9 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
|
||||
|
||||
connect(m_ctx, &AppContext::walletAboutToClose, [=]{
|
||||
if (!config()->get(Config::showTabHome).toBool())
|
||||
ui->tabWidget->setCurrentIndex(Tabs::HISTORY);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::HISTORY);
|
||||
else
|
||||
ui->tabWidget->setCurrentIndex(Tabs::HOME);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::HOME);
|
||||
|
||||
// Clear all tables when wallet is closed
|
||||
ui->historyWidget->resetModel();
|
||||
@@ -415,13 +428,9 @@ void MainWindow::initMenu() {
|
||||
m_tabShowHideMapper["Calc"] = new ToggleTab(ui->tabCalc, "Calc", "Calc", ui->actionShow_calc, Config::showTabCalc);
|
||||
m_tabShowHideSignalMapper->setMapping(ui->actionShow_calc, "Calc");
|
||||
|
||||
#if defined(HAS_XMRIG)
|
||||
connect(ui->actionShow_XMRig, &QAction::triggered, m_tabShowHideSignalMapper, QOverload<>::of(&QSignalMapper::map));
|
||||
m_tabShowHideMapper["Mining"] = new ToggleTab(ui->tabXmrRig, "Mining", "Mining", ui->actionShow_XMRig, Config::showTabXMRig);
|
||||
m_tabShowHideSignalMapper->setMapping(ui->actionShow_XMRig, "Mining");
|
||||
#else
|
||||
ui->actionShow_XMRig->setVisible(false);
|
||||
#endif
|
||||
|
||||
for (const auto &key: m_tabShowHideMapper.keys()) {
|
||||
const auto toggleTab = m_tabShowHideMapper.value(key);
|
||||
@@ -520,7 +529,7 @@ void MainWindow::menuToggleTabVisible(const QString &key){
|
||||
|
||||
void MainWindow::initWidgets() {
|
||||
int homeWidget = config()->get(Config::homeWidget).toInt();
|
||||
ui->tabHomeWidget->setCurrentIndex(TabsHome(homeWidget));
|
||||
ui->tabHomeWidget->setCurrentIndex(globals::TabsHome(homeWidget));
|
||||
}
|
||||
|
||||
WalletWizard *MainWindow::createWizard(WalletWizard::Page startPage){
|
||||
@@ -632,6 +641,7 @@ void MainWindow::onWalletOpened(Wallet *wallet) {
|
||||
|
||||
// contacts widget
|
||||
ui->contactWidget->setModel(m_ctx->currentWallet->addressBookModel());
|
||||
ui->contactWidget->loadYellowPages();
|
||||
|
||||
// coins page
|
||||
m_ctx->currentWallet->coins()->refresh(m_ctx->currentWallet->currentSubaddressAccount());
|
||||
@@ -966,7 +976,6 @@ void MainWindow::menuNewRestoreClicked() {
|
||||
|
||||
void MainWindow::menuQuitClicked() {
|
||||
cleanupBeforeClose();
|
||||
|
||||
QCoreApplication::quit();
|
||||
}
|
||||
|
||||
@@ -1036,9 +1045,16 @@ void MainWindow::skinChanged(const QString &skinName) {
|
||||
}
|
||||
|
||||
void MainWindow::closeEvent(QCloseEvent *event) {
|
||||
cleanupBeforeClose();
|
||||
auto hideOnClose = config()->get(Config::hideOnClose).toBool();
|
||||
if(hideOnClose && !this->isHidden()) {
|
||||
this->hide();
|
||||
event->ignore();
|
||||
return;
|
||||
}
|
||||
|
||||
cleanupBeforeClose();
|
||||
QWidget::closeEvent(event);
|
||||
QApplication::exit();
|
||||
}
|
||||
|
||||
void MainWindow::donateButtonClicked() {
|
||||
@@ -1047,25 +1063,35 @@ void MainWindow::donateButtonClicked() {
|
||||
donation = 0.1337;
|
||||
|
||||
ui->sendWidget->fill(m_ctx->donationAddress, "Donation to the WOWlet development team", donation);
|
||||
ui->tabWidget->setCurrentIndex(Tabs::SEND);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::SEND);
|
||||
}
|
||||
|
||||
void MainWindow::showHistoryTab() {
|
||||
this->raise();
|
||||
ui->tabWidget->setCurrentIndex(Tabs::HISTORY);
|
||||
this->show();
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::HISTORY);
|
||||
}
|
||||
|
||||
void MainWindow::showSendTab() {
|
||||
this->raise();
|
||||
ui->tabWidget->setCurrentIndex(Tabs::SEND);
|
||||
this->show();
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::SEND);
|
||||
}
|
||||
|
||||
void MainWindow::showHomeWindow() {
|
||||
this->raise();
|
||||
this->show();
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::HOME);
|
||||
}
|
||||
|
||||
void MainWindow::showCalcWindow() {
|
||||
this->raise();
|
||||
this->show();
|
||||
m_windowCalc->show();
|
||||
}
|
||||
|
||||
void MainWindow::payToMany() {
|
||||
ui->tabWidget->setCurrentIndex(Tabs::SEND);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::SEND);
|
||||
ui->sendWidget->payToMany();
|
||||
QMessageBox::information(this, "Pay to many", "Enter a list of outputs in the 'Pay to' field.\n"
|
||||
"One output per line.\n"
|
||||
@@ -1075,7 +1101,7 @@ void MainWindow::payToMany() {
|
||||
|
||||
void MainWindow::showSendScreen(const CCSEntry &entry) {
|
||||
ui->sendWidget->fill(entry);
|
||||
ui->tabWidget->setCurrentIndex(Tabs::SEND);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::SEND);
|
||||
}
|
||||
|
||||
void MainWindow::suchDonate(const QString address) {
|
||||
@@ -1083,12 +1109,15 @@ void MainWindow::suchDonate(const QString address) {
|
||||
QString preferredCurrency = config()->get(Config::preferredFiatCurrency).toString();
|
||||
double donation = AppContext::prices->convert(preferredCurrency, "WOW", tipAmount);
|
||||
ui->sendWidget->fill(address, "SuchWow contribution :-)", donation);
|
||||
ui->tabWidget->setCurrentIndex(Tabs::SEND);
|
||||
ui->tabWidget->setCurrentIndex(globals::Tabs::SEND);
|
||||
}
|
||||
|
||||
void MainWindow::onViewOnBlockExplorer(const QString &txid) {
|
||||
QString blockExplorerLink = Utils::blockExplorerLink(config()->get(Config::blockExplorer).toString(), m_ctx->networkType, txid);
|
||||
Utils::externalLinkWarning(this, blockExplorerLink);
|
||||
QString blockExplorerLink = Utils::blockExplorerLink(txid);
|
||||
if(!blockExplorerLink.isEmpty())
|
||||
Utils::externalLinkWarning(this, blockExplorerLink);
|
||||
else
|
||||
QMessageBox::warning(this, "Error", "Could not generate block explorer URL");
|
||||
}
|
||||
|
||||
void MainWindow::onResendTransaction(const QString &txid) {
|
||||
@@ -1260,6 +1289,7 @@ void MainWindow::importOutputs() {
|
||||
void MainWindow::cleanupBeforeClose() {
|
||||
m_ctx->closeWallet(false, true);
|
||||
m_ctx->tor->stop();
|
||||
m_ctx->XMRig->stop();
|
||||
|
||||
this->saveGeo();
|
||||
}
|
||||
@@ -1384,7 +1414,12 @@ void MainWindow::onUpdateWowWidget() {
|
||||
}
|
||||
|
||||
auto wowObj = AppContext::prices->markets["WOW"];
|
||||
auto currencyText = Utils::amountToCurrencyString(wowObj.price_usd, fiatCurrency);
|
||||
|
||||
double amount = wowObj.price_usd;
|
||||
if(fiatCurrency != "USD")
|
||||
amount = AppContext::prices->convert("USD", fiatCurrency, amount);
|
||||
|
||||
auto currencyText = Utils::amountToCurrencyString(amount, fiatCurrency, 5);
|
||||
m_tickerWOW->setFiatText(currencyText);
|
||||
|
||||
auto pct24h = AppContext::prices->markets["WOW"].price_usd_change_pct_24h;
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "utils/config.h"
|
||||
#include "wizard/walletwizard.h"
|
||||
#include "settings.h"
|
||||
#include "globals.h"
|
||||
#include "dialog/aboutdialog.h"
|
||||
#include "dialog/signverifydialog.h"
|
||||
#include "dialog/verifyproofdialog.h"
|
||||
@@ -74,23 +75,6 @@ public:
|
||||
qreal screenDpiPhysical;
|
||||
qreal screenRatio;
|
||||
|
||||
enum Tabs {
|
||||
HOME = 0,
|
||||
HISTORY,
|
||||
SEND,
|
||||
RECEIVE,
|
||||
COINS,
|
||||
CALC,
|
||||
XMRIG
|
||||
};
|
||||
|
||||
enum TabsHome {
|
||||
FORUM,
|
||||
REDDIT,
|
||||
SUCHWOW,
|
||||
WFS
|
||||
};
|
||||
|
||||
public slots:
|
||||
void initWidgets();
|
||||
void initMenu();
|
||||
@@ -109,6 +93,7 @@ public slots:
|
||||
void showViewOnlyDialog();
|
||||
void donateButtonClicked();
|
||||
void showCalcWindow();
|
||||
void showHomeWindow();
|
||||
void payToMany();
|
||||
void showWalletCacheDebugDialog();
|
||||
void showSendTab();
|
||||
@@ -200,6 +185,7 @@ private:
|
||||
|
||||
QSystemTrayIcon *m_trayIcon;
|
||||
QMenu m_trayMenu;
|
||||
QAction *m_trayActionHome;
|
||||
QAction *m_trayActionCalc;
|
||||
QAction *m_trayActionExit;
|
||||
QAction *m_trayActionSend;
|
||||
|
||||
@@ -316,20 +316,6 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabCalc">
|
||||
<attribute name="icon">
|
||||
<iconset resource="assets.qrc">
|
||||
<normaloff>:/assets/images/gnome-calc.png</normaloff>:/assets/images/gnome-calc.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="title">
|
||||
<string>Calc</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<widget class="CalcWidget" name="conversionWidget" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabXmrRig">
|
||||
<attribute name="icon">
|
||||
<iconset resource="assets.qrc">
|
||||
@@ -344,6 +330,20 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabCalc">
|
||||
<attribute name="icon">
|
||||
<iconset resource="assets.qrc">
|
||||
<normaloff>:/assets/images/gnome-calc.png</normaloff>:/assets/images/gnome-calc.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="title">
|
||||
<string>Calc</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<widget class="CalcWidget" name="conversionWidget" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
@@ -53,10 +53,10 @@ int TransactionHistoryModel::columnCount(const QModelIndex &parent) const {
|
||||
|
||||
// When wowlet is in QtWidgets mode, it will only use the first 5 columns,
|
||||
// the rest should be hidden, because it shows in the GUI. So by default we'll
|
||||
// use 5 as column count. When in QtQuick (QML) mode, we want to expose more columns
|
||||
// use 6 as column count. When in QtQuick (QML) mode, we want to expose more columns
|
||||
// so we can change the column count here.
|
||||
|
||||
return AppContext::isQML ? this->COUNT : 5;
|
||||
return AppContext::isQML ? this->COUNT : 7;
|
||||
}
|
||||
|
||||
QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const {
|
||||
@@ -76,7 +76,9 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const
|
||||
else if (role == Qt::TextAlignmentRole) {
|
||||
switch (index.column()) {
|
||||
case TransactionInfoRole::Amount:
|
||||
case TransactionInfoRole::FiatAmount:
|
||||
case TransactionInfoRole::HistoricalPrice:
|
||||
case TransactionInfoRole::HistoricalRate:
|
||||
case TransactionInfoRole::CurrentPrice:
|
||||
result = Qt::AlignRight;
|
||||
}
|
||||
}
|
||||
@@ -118,7 +120,6 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const
|
||||
}
|
||||
else if (role == Qt::ForegroundRole) {
|
||||
switch(index.column()) {
|
||||
case TransactionInfoRole::FiatAmount:
|
||||
case TransactionInfoRole::Amount:
|
||||
{
|
||||
if (tInfo.direction() == TransactionInfo::Direction_Out) {
|
||||
@@ -170,18 +171,16 @@ QVariant TransactionHistoryModel::parseTransactionInfo(const TransactionInfo &tI
|
||||
}
|
||||
case TransactionInfoRole::TxID:
|
||||
return tInfo.hash();
|
||||
case TransactionInfoRole::FiatAmount:
|
||||
case TransactionInfoRole::HistoricalRate: {
|
||||
return tInfo.historicalRateStr();
|
||||
}
|
||||
case TransactionInfoRole::HistoricalPrice:
|
||||
{
|
||||
double usd_price = AppContext::txFiatHistory->get(tInfo.timestamp().toString("yyyyMMdd"));
|
||||
if (usd_price == 0.0)
|
||||
return QVariant("?");
|
||||
|
||||
double usd_amount = usd_price * (tInfo.balanceDelta() / globals::cdiv);
|
||||
if(this->preferredFiatSymbol != "USD")
|
||||
usd_amount = AppContext::prices->convert("USD", this->preferredFiatSymbol, usd_amount);
|
||||
double fiat_rounded = ceil(Utils::roundSignificant(usd_amount, 3) * 100.0) / 100.0;
|
||||
|
||||
return QString("%1").arg(Utils::amountToCurrencyString(fiat_rounded, this->preferredFiatSymbol));
|
||||
return tInfo.historicalPriceStr();
|
||||
}
|
||||
case TransactionInfoRole::CurrentPrice:
|
||||
{
|
||||
return tInfo.currentPriceStr();
|
||||
}
|
||||
default:
|
||||
{
|
||||
@@ -206,8 +205,12 @@ QVariant TransactionHistoryModel::headerData(int section, Qt::Orientation orient
|
||||
return QString("Amount");
|
||||
case TransactionInfoRole::TxID:
|
||||
return QString("Txid");
|
||||
case TransactionInfoRole::FiatAmount:
|
||||
return QString("Fiat");
|
||||
case TransactionInfoRole::HistoricalPrice:
|
||||
return QString("Historical price");
|
||||
case TransactionInfoRole::HistoricalRate:
|
||||
return QString("Historical rate");
|
||||
case TransactionInfoRole::CurrentPrice:
|
||||
return QString("Current price");
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,9 @@ public:
|
||||
Description,
|
||||
Amount,
|
||||
TxID,
|
||||
FiatAmount,
|
||||
HistoricalPrice,
|
||||
HistoricalRate,
|
||||
CurrentPrice,
|
||||
TransactionIsOutRole,
|
||||
TransactionFailedRole,
|
||||
TransactionPendingRole,
|
||||
|
||||
@@ -16,5 +16,6 @@ target_include_directories(openpgp PUBLIC
|
||||
|
||||
target_link_libraries(openpgp
|
||||
PUBLIC
|
||||
epee
|
||||
${GCRYPT_LIBRARY}
|
||||
${GPG_ERROR_LIBRARY})
|
||||
|
||||
@@ -30,6 +30,11 @@ Settings::Settings(QWidget *parent) :
|
||||
m_ctx->updateBalance();
|
||||
});
|
||||
|
||||
connect(ui->checkBox_hideOnClose, &QCheckBox::toggled, [this](bool toggled){
|
||||
config()->set(Config::hideOnClose, toggled);
|
||||
QApplication::setQuitOnLastWindowClosed(toggled);
|
||||
});
|
||||
|
||||
connect(ui->closeButton, &QDialogButtonBox::accepted, this, &Settings::close);
|
||||
|
||||
// nodes
|
||||
@@ -40,6 +45,7 @@ Settings::Settings(QWidget *parent) :
|
||||
// setup checkboxes
|
||||
ui->checkBox_externalLink->setChecked(config()->get(Config::warnOnExternalLink).toBool());
|
||||
ui->checkBox_hideBalance->setChecked(config()->get(Config::hideBalance).toBool());
|
||||
ui->checkBox_hideOnClose->setChecked(config()->get(Config::hideOnClose).toBool());
|
||||
|
||||
// setup comboboxes
|
||||
this->setupSkinCombobox();
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>blockchair.com</string>
|
||||
<string>kryfi.com</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
@@ -198,6 +198,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0">
|
||||
<widget class="QCheckBox" name="checkBox_hideOnClose">
|
||||
<property name="text">
|
||||
<string>Hide application on close</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_node">
|
||||
|
||||
@@ -0,0 +1,678 @@
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
color: "#181725"
|
||||
anchors.fill: parent
|
||||
property variant buffer: []
|
||||
property int bufferMaxLength: 12
|
||||
// state: 0:idle 1:startup 2:syncing 3:mining
|
||||
signal startMining();
|
||||
signal stopMining();
|
||||
|
||||
Component.onCompleted: {
|
||||
calcAvailableHeightConsoleLines();
|
||||
}
|
||||
|
||||
onHeightChanged: {
|
||||
calcAvailableHeightConsoleLines();
|
||||
}
|
||||
|
||||
function calcAvailableHeightConsoleLines() {
|
||||
var max_lines = parseInt(textContainer.height / 20);
|
||||
if(root.bufferMaxLength != max_lines && max_lines >= 4)
|
||||
root.bufferMaxLength = max_lines;
|
||||
}
|
||||
|
||||
// width: 980
|
||||
// height: 480
|
||||
|
||||
Column {
|
||||
FontLoader { id: comicMono; source: "qrc:/fonts/ComicMono.ttf" }
|
||||
FontLoader { id: comicMonoBold; source: "qrc:/fonts/ComicMono-Bold.ttf" }
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
spacing: 0
|
||||
|
||||
RowLayout {
|
||||
spacing: 0
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 128
|
||||
|
||||
Image {
|
||||
source: "qrc:/mining/topleft.png"
|
||||
Layout.preferredWidth: 435
|
||||
Layout.preferredHeight: 128
|
||||
smooth: false
|
||||
|
||||
// top-left monitors
|
||||
ColumnLayout {
|
||||
width: 102
|
||||
height: 74
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 14
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 42
|
||||
|
||||
Rectangle {
|
||||
color: "transparent"
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Text {
|
||||
text: "Hashrate"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 4
|
||||
font.pointSize: 14
|
||||
font.family: comicMonoBold.name;
|
||||
antialiasing: false
|
||||
color: "#41FF00"
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: "transparent"
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Text {
|
||||
id: hashRateText
|
||||
text: "-"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 4
|
||||
font.pointSize: 16
|
||||
font.family: comicMono.name;
|
||||
antialiasing: false
|
||||
color: "#41FF00"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
width: 102
|
||||
height: 74
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 142
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 42
|
||||
|
||||
Rectangle {
|
||||
color: "transparent"
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Text {
|
||||
text: "uptime"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 4
|
||||
font.pointSize: 14
|
||||
font.family: comicMonoBold.name;
|
||||
antialiasing: false
|
||||
color: "#41FF00"
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: "transparent"
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Text {
|
||||
id: miningUptime
|
||||
text: "-"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 4
|
||||
font.pointSize: 12
|
||||
font.family: comicMono.name;
|
||||
antialiasing: false
|
||||
color: "#41FF00"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AnimatedImage {
|
||||
visible: mining.daemonMiningState !== 0
|
||||
source: "qrc:/mining/mining.webp"
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
width: 115
|
||||
height: 86
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 263
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 34
|
||||
}
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 128
|
||||
spacing: 0
|
||||
|
||||
Image {
|
||||
source: "qrc:/mining/warning.png"
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 15
|
||||
fillMode: Image.TileHorizontally
|
||||
smooth: false
|
||||
}
|
||||
|
||||
Image {
|
||||
source: "qrc:/mining/topright_bar.png"
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 4
|
||||
fillMode: Image.TileHorizontally
|
||||
smooth: false
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: 0
|
||||
Layout.fillHeight: true
|
||||
Layout.preferredHeight: 102
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 5
|
||||
Layout.preferredHeight: parent.height
|
||||
source: "qrc:/mining/topright_left.png"
|
||||
smooth: false
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: parent.height
|
||||
source: "qrc:/mining/topright_middle.png"
|
||||
fillMode: Image.TileHorizontally
|
||||
smooth: false
|
||||
|
||||
RowLayout {
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 6
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 8
|
||||
anchors.topMargin: 12
|
||||
|
||||
height: 78
|
||||
spacing: 16
|
||||
|
||||
ColumnLayout {
|
||||
Layout.minimumWidth: 200
|
||||
Layout.maximumWidth: 260
|
||||
Layout.fillHeight: true
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: "transparent"
|
||||
|
||||
Text {
|
||||
text: "Block Height"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 8
|
||||
font.pointSize: 20
|
||||
font.family: comicMonoBold.name;
|
||||
color: "#41FF00"
|
||||
antialiasing: false
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: "transparent"
|
||||
|
||||
Text {
|
||||
id: heightText
|
||||
text: "-"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 8
|
||||
font.pointSize: 18
|
||||
font.family: comicMonoBold.name;
|
||||
color: "#41FF00"
|
||||
antialiasing: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
Layout.minimumWidth: 200
|
||||
Layout.maximumWidth: 260
|
||||
Layout.fillHeight: true
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: "transparent"
|
||||
|
||||
Text {
|
||||
text: "Sync Progress"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 8
|
||||
font.pointSize: 20
|
||||
font.family: comicMonoBold.name;
|
||||
color: "#41FF00"
|
||||
antialiasing: false
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: "transparent"
|
||||
|
||||
Text {
|
||||
id: syncPctText
|
||||
text: "-"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
|
||||
font.pointSize: 18
|
||||
font.family: comicMonoBold.name;
|
||||
color: "#41FF00"
|
||||
antialiasing: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 5
|
||||
Layout.preferredHeight: parent.height
|
||||
source: "qrc:/mining/topright_right.png"
|
||||
smooth: false
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
Layout.preferredHeight: 7 // 15 + 4 + 102 + 7 = 128
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: 0
|
||||
//Layout.preferredHeight: 128
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 6
|
||||
Layout.fillHeight: true
|
||||
source: "qrc:/mining/r_left.png"
|
||||
fillMode: Image.TileVertically
|
||||
smooth: false
|
||||
}
|
||||
|
||||
Item {
|
||||
// text container
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
Rectangle {
|
||||
id: textContainer
|
||||
color: "transparent"
|
||||
height: parent.height - 20
|
||||
width: parent.width - 32
|
||||
clip: true
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
Text {
|
||||
id: cons
|
||||
anchors.margins: 4
|
||||
anchors.fill: parent
|
||||
text: "Miner is idle."
|
||||
font.pointSize: 12
|
||||
font.family: comicMono.name;
|
||||
wrapMode: Text.WordWrap
|
||||
color: "white"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 6
|
||||
Layout.fillHeight: true
|
||||
source: "qrc:/mining/r_right.png"
|
||||
fillMode: Image.TileVertically
|
||||
smooth: false
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: 0
|
||||
Layout.preferredHeight: 140
|
||||
Layout.fillWidth: true
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 306
|
||||
Layout.preferredHeight: 140
|
||||
source: "qrc:/mining/lowerleft.png"
|
||||
smooth: false
|
||||
|
||||
AnimatedImage {
|
||||
source: mining.daemonMiningState === 0 ? "qrc:/assets/images/dog_sitting.gif" : "qrc:/assets/images/dog_running.gif"
|
||||
width: 80
|
||||
height: 60
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 22
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 22
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onEntered: {
|
||||
showBubble();
|
||||
}
|
||||
onExited: {
|
||||
hideBubble();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 140
|
||||
source: "qrc:/mining/lower_repeat.png"
|
||||
fillMode: Image.TileHorizontally
|
||||
smooth: false
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 236
|
||||
Layout.preferredHeight: 140
|
||||
source: "qrc:/mining/bottom_center_console.png"
|
||||
smooth: false
|
||||
|
||||
Rectangle {
|
||||
// middle console clock
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 100
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 8
|
||||
color: "transparent"
|
||||
|
||||
width: 54
|
||||
height: 16
|
||||
|
||||
Text {
|
||||
id: clock
|
||||
text: ""
|
||||
antialiasing: false
|
||||
font.pointSize: 9
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
font.family: comicMonoBold.name;
|
||||
color: "#41FF00";
|
||||
|
||||
Component.onCompleted: {
|
||||
root.setClock();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
source: {
|
||||
var imgs = ["qrc:/mining/amd.png", "qrc:/mining/intel.png"];
|
||||
return imgs[Math.floor(Math.random()*imgs.length)];
|
||||
}
|
||||
width: 100
|
||||
height: 100
|
||||
fillMode: Image.Pad
|
||||
smooth: false
|
||||
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 140
|
||||
source: "qrc:/mining/lower_repeat.png"
|
||||
fillMode: Image.TileHorizontally
|
||||
smooth: false
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 308
|
||||
Layout.preferredHeight: 140
|
||||
source: "qrc:/mining/lowerright.png"
|
||||
smooth: false
|
||||
|
||||
Rectangle {
|
||||
// lower-right button container
|
||||
color: "transparent"
|
||||
width: 106
|
||||
height: 100
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 11
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 34
|
||||
|
||||
Image {
|
||||
id: imgAxe
|
||||
visible: mining.daemonMiningState === 0
|
||||
source: "qrc:/mining/axe.png"
|
||||
width: 73
|
||||
height: 75
|
||||
smooth: false
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
|
||||
AnimatedImage {
|
||||
visible: mining.daemonMiningState !== 0
|
||||
source: "qrc:/mining/elmo.gif"
|
||||
width: 106
|
||||
height: 100
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
|
||||
Text {
|
||||
id: stopMiningBtn
|
||||
visible: true
|
||||
text: "Stop Mining"
|
||||
font.pointSize: 10
|
||||
z: parent.z + 1
|
||||
color: "black"
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 28
|
||||
font.family: comicMonoBold.name;
|
||||
antialiasing: false
|
||||
}
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
z: parent.z + 1
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
|
||||
onClicked: {
|
||||
if(mining.daemonMiningState === 0) {
|
||||
root.startMining();
|
||||
root.calcAvailableHeightConsoleLines();
|
||||
}
|
||||
else
|
||||
root.stopMining();
|
||||
}
|
||||
onEntered: {
|
||||
imgAxe.height = 64
|
||||
imgAxe.width = 64
|
||||
}
|
||||
onExited: {
|
||||
imgAxe.height = 75
|
||||
imgAxe.width = 73
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
id: bubble
|
||||
visible: false
|
||||
source: "qrc:/mining/bubble.png"
|
||||
width: 200
|
||||
height: 60
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 64
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 48
|
||||
|
||||
Rectangle {
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 6
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 10
|
||||
height: 26
|
||||
color: "transparent"
|
||||
width: 183
|
||||
z: parent.z + 1
|
||||
|
||||
Text {
|
||||
id: bubbleText
|
||||
text: ""
|
||||
color: "black"
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
//font.family: ComicMonoBold.name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: setClockTimer
|
||||
interval: 1000*60
|
||||
running: true
|
||||
repeat: true
|
||||
onTriggered: setClock()
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: dogBubbleTimer
|
||||
interval: 1000*30
|
||||
running: true
|
||||
repeat: true
|
||||
onTriggered: {
|
||||
if(Math.random() >= 0.5) return;
|
||||
if(bubble.visible) return;
|
||||
root.dogBubbleRemoval.stop();
|
||||
root.dogBubbleRemoval.start();
|
||||
|
||||
var msg = root.bubbleMessage();
|
||||
|
||||
bubbleText.text = msg;
|
||||
bubble.visible = true;
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: dogBubbleRemoval
|
||||
interval: 2500
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered: bubble.visible = false;
|
||||
}
|
||||
|
||||
function setClock() {
|
||||
var now = new Date();
|
||||
var hours = now.getHours();
|
||||
var minutes = ('0'+now.getMinutes()).slice(-2);
|
||||
clock.text = hours + ":" + minutes;
|
||||
}
|
||||
|
||||
function resetComponents() {
|
||||
hashRateText.text = "-";
|
||||
miningUptime.text = "-";
|
||||
syncPctText.text = "-";
|
||||
heightText.text = "-";
|
||||
}
|
||||
|
||||
function consoleAppend(line) {
|
||||
if(root.buffer.length >= root.bufferMaxLength)
|
||||
root.buffer.shift()
|
||||
root.buffer.push(line);
|
||||
|
||||
cons.text = "";
|
||||
for(var i = 0; i != root.bufferMaxLength; i++) {
|
||||
if(root.buffer[i])
|
||||
cons.text += root.buffer[i] + "\n";
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: mining
|
||||
function onDaemonOutput(line) {
|
||||
root.consoleAppend(line);
|
||||
}
|
||||
|
||||
function onSyncStatus(from, to, pct) {
|
||||
syncPctText.text = pct + "%";
|
||||
heightText.text = from + "/" + to;
|
||||
}
|
||||
|
||||
function onUptimeChanged(uptime) {
|
||||
miningUptime.text = uptime;
|
||||
}
|
||||
|
||||
function onHashrate(hashrate) {
|
||||
hashRateText.text = hashrate;
|
||||
}
|
||||
}
|
||||
|
||||
function showBubble() {
|
||||
if(bubble.visible) return;
|
||||
var msg = root.bubbleMessage();
|
||||
|
||||
bubbleText.text = msg;
|
||||
bubble.visible = true;
|
||||
}
|
||||
|
||||
function hideBubble() {
|
||||
bubble.visible = false;
|
||||
}
|
||||
|
||||
function bubbleMessage() {
|
||||
var active = ["such work!", "mining WOW!", "woof woof!", "I am tired!", "mining :@", "weeeee", "blocks everywhere!", "wooohoo", "working, twerkin'", "looking4blocks", "mining blocks"];
|
||||
var inactive = ["doing nothing!", "ZzZZzzZ", "wen mining?!", "ETA mining?!", "zZZzzZZz", "omg so bored", "so bored!!", "much idle, many zZz", "lets go!", "i'm ready!"];
|
||||
var syncing = ["wen 1gbit", "syncin'", "zZzz", "ETA sync ready?!", "downloading blocks", "fetching blocks"];
|
||||
var msg = "";
|
||||
|
||||
if(mining.daemonMiningState === 0) {
|
||||
return inactive[Math.floor(Math.random()*inactive.length)];
|
||||
} else if (mining.daemonMiningState === 2) {
|
||||
return syncing[Math.floor(Math.random()*syncing.length)];
|
||||
} else {
|
||||
return active[Math.floor(Math.random()*active.length)];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,24 +28,26 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
|
||||
{Config::openVRSkin,{QS("openVRSkin"), "default"}},
|
||||
{Config::openVRStreamerMode,{QS("openVRStreamerMode"), false}},
|
||||
{Config::preferredFiatCurrency,{QS("preferredFiatCurrency"), "USD"}},
|
||||
{Config::blockExplorer,{QS("blockExplorer"), "explore.wownero.com"}},
|
||||
{Config::blockExplorer,{QS("blockExplorer"), "kryfi.com"}},
|
||||
{Config::walletDirectory,{QS("walletDirectory"), ""}},
|
||||
{Config::autoOpenWalletPath,{QS("autoOpenWalletPath"), ""}},
|
||||
{Config::walletPath,{QS("walletPath"), ""}},
|
||||
{Config::xmrigPath,{QS("xmrigPath"), ""}},
|
||||
{Config::xmrigPool,{QS("xmrigPool"), "cryptonote.social:2223"}},
|
||||
{Config::wownerodPath, {QS("wownerodPath"), ""}},
|
||||
{Config::nodes,{QS("nodes"), "{}"}},
|
||||
{Config::websocketEnabled,{QS("websocketEnabled"), true}},
|
||||
{Config::nodeSource,{QS("nodeSource"), 0}},
|
||||
{Config::useOnionNodes,{QS("useOnionNodes"), false}},
|
||||
{Config::showTabHome,{QS("showTabHome"), true}},
|
||||
{Config::showTabCoins,{QS("showTabCoins"), false}},
|
||||
{Config::showTabXMRig,{QS("showTabXMRig"), false}},
|
||||
{Config::showTabXMRig,{QS("showTabXMRig"), true}},
|
||||
{Config::showTabCalc,{QS("showTabCalc"), false}},
|
||||
{Config::geometry, {QS("geometry"), {}}},
|
||||
{Config::windowState, {QS("windowState"), {}}},
|
||||
{Config::firstRun,{QS("firstRun"), false}},
|
||||
{Config::hideBalance, {QS("hideBalance"), false}},
|
||||
{Config::hideOnClose, {QS("hideOnClose"), false}},
|
||||
{Config::simplifiedMiningInterface, {QS("simplifiedMiningInterface"), false}},
|
||||
{Config::hideFiatBalance, {QS("hideFiatBalance"), false}},
|
||||
{Config::redditFrontend, {QS("redditFrontend"), "old.reddit.com"}},
|
||||
{Config::showHistorySyncNotice, {QS("showHistorySyncNotice"), true}},
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
walletDirectory,
|
||||
walletPath,
|
||||
xmrigPath,
|
||||
xmrigPool,
|
||||
wownerodPath,
|
||||
nodes,
|
||||
websocketEnabled,
|
||||
nodeSource,
|
||||
@@ -49,6 +49,8 @@ public:
|
||||
firstRun,
|
||||
hideBalance,
|
||||
hideFiatBalance,
|
||||
hideOnClose,
|
||||
simplifiedMiningInterface,
|
||||
redditFrontend,
|
||||
showHistorySyncNotice,
|
||||
ignoreUpdateWarning,
|
||||
|
||||
@@ -238,8 +238,13 @@ QString Utils::copyFromClipboard() {
|
||||
return clipboard->text();
|
||||
}
|
||||
|
||||
QString Utils::blockExplorerLink(const QString &blockExplorer, NetworkType::Type nettype, const QString &txid) {
|
||||
return QString("https://explore.wownero.com/tx/%1").arg(txid);
|
||||
QString Utils::blockExplorerLink(const QString &txid) {
|
||||
auto explorer = config()->get(Config::blockExplorer).toString();
|
||||
if(explorer.startsWith("kryfi.com")) {
|
||||
return QString("https://kryfi.com/explorer/wownero/tx/%1").arg(txid);
|
||||
} else {
|
||||
return QString("https://explore.wownero.com/tx/%1").arg(txid);
|
||||
}
|
||||
}
|
||||
|
||||
QStandardItem *Utils::qStandardItem(const QString& text) {
|
||||
@@ -413,14 +418,14 @@ double Utils::roundUp(double value, int decimal_places) {
|
||||
return std::ceil(value * multiplier) / multiplier;
|
||||
}
|
||||
|
||||
QString Utils::amountToCurrencyString(double amount, const QString ¤cyCode) {
|
||||
QString Utils::amountToCurrencyString(double amount, const QString ¤cyCode, int precision) {
|
||||
QLocale locale = getCurrencyLocale(currencyCode);
|
||||
|
||||
// \xC2\xA0 = UTF-8 non-breaking space, it looks off.
|
||||
if (currencyCode == "USD")
|
||||
return locale.toCurrencyString(amount, "$").remove("\xC2\xA0");
|
||||
return locale.toCurrencyString(amount, "$", precision).remove("\xC2\xA0");
|
||||
|
||||
return locale.toCurrencyString(amount).remove("\xC2\xA0");
|
||||
return locale.toCurrencyString(amount, nullptr, precision).remove("\xC2\xA0");
|
||||
}
|
||||
|
||||
int Utils::maxLength(const QVector<QString> &array) {
|
||||
|
||||
@@ -64,7 +64,7 @@ public:
|
||||
static QStandardItem *qStandardItem(const QString &text, QFont &font);
|
||||
static void copyToClipboard(const QString &string);
|
||||
static QString copyFromClipboard();
|
||||
static QString blockExplorerLink(const QString &blockExplorer, NetworkType::Type nettype, const QString &txid);
|
||||
static QString blockExplorerLink(const QString &txid);
|
||||
static QString getUnixAccountName();
|
||||
static QString xdgDesktopEntry();
|
||||
static bool xdgDesktopEntryWrite(const QString &path);
|
||||
@@ -75,7 +75,7 @@ public:
|
||||
static double roundSignificant(double N, double n);
|
||||
static QString formatBytes(quint64 bytes);
|
||||
static QLocale getCurrencyLocale(const QString ¤cyCode);
|
||||
static QString amountToCurrencyString(double amount, const QString ¤cyCode);
|
||||
static QString amountToCurrencyString(double amount, const QString ¤cyCode, int precision = 2);
|
||||
static int maxLength(const QVector<QString> &array);
|
||||
static double roundUp(double value, int decimal_places);
|
||||
static QMap<QString, QLocale> localeCache;
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
#include "wsclient.h"
|
||||
#include "appcontext.h"
|
||||
|
||||
WSClient::WSClient(AppContext *ctx, const QString &url, QObject *parent) :
|
||||
WSClient::WSClient(AppContext *ctx, QObject *parent) :
|
||||
QObject(parent),
|
||||
m_ctx(ctx) {
|
||||
// this class connects to `https://git.wownero.com/wowlet/wowlet-backend/`
|
||||
connect(&this->webSocket, &QWebSocket::binaryMessageReceived, this, &WSClient::onbinaryMessageReceived);
|
||||
connect(&this->webSocket, &QWebSocket::connected, this, &WSClient::onConnected);
|
||||
connect(&this->webSocket, &QWebSocket::disconnected, this, &WSClient::closed);
|
||||
connect(&this->webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WSClient::onError);
|
||||
|
||||
m_tor = url.contains(".onion");
|
||||
this->url = QString("ws://%1/ws").arg(url);
|
||||
m_tor = m_ctx->backendHost.contains(".onion");
|
||||
|
||||
// Keep websocket connection alive
|
||||
// keep-alive
|
||||
connect(&m_pingTimer, &QTimer::timeout, [this]{
|
||||
if (this->webSocket.state() == QAbstractSocket::ConnectedState)
|
||||
this->webSocket.ping();
|
||||
@@ -40,7 +40,7 @@ void WSClient::start() {
|
||||
qDebug() << "WebSocket connect:" << url.url();
|
||||
#endif
|
||||
if((m_tor && this->m_ctx->tor->torConnected) || !m_tor)
|
||||
this->webSocket.open(QUrl(this->url));
|
||||
this->webSocket.open(QString("%1/ws").arg(m_ctx->backendWSUrl));
|
||||
|
||||
if(!this->m_connectionTimer.isActive()) {
|
||||
connect(&this->m_connectionTimer, &QTimer::timeout, this, &WSClient::checkConnection);
|
||||
|
||||
@@ -14,11 +14,10 @@ class WSClient : public QObject
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit WSClient(AppContext *ctx, const QString &url, QObject *parent = nullptr);
|
||||
explicit WSClient(AppContext *ctx, QObject *parent = nullptr);
|
||||
void start();
|
||||
void sendMsg(const QByteArray &data);
|
||||
QWebSocket webSocket;
|
||||
QString url;
|
||||
|
||||
signals:
|
||||
void closed();
|
||||
|
||||
@@ -7,17 +7,24 @@
|
||||
|
||||
#include "utils/utils.h"
|
||||
#include "utils/xmrig.h"
|
||||
#include "appcontext.h"
|
||||
#include "mainwindow.h"
|
||||
|
||||
XmRig::XmRig(const QString &configDir, QObject *parent) : QObject(parent) {
|
||||
this->rigDir = QDir(configDir).filePath("xmrig");
|
||||
XmRig::XmRig(const QString &configDir, QObject *parent) :
|
||||
QObject(parent),
|
||||
m_statusTimer(new QTimer(this))
|
||||
{
|
||||
m_statusTimer->setInterval(5000);
|
||||
connect(m_statusTimer, &QTimer::timeout, [this]{
|
||||
if(daemonMiningState == DaemonMiningState::mining && m_process.state() == QProcess::Running)
|
||||
m_process.write("status\n");
|
||||
});
|
||||
}
|
||||
|
||||
void XmRig::prepare() {
|
||||
m_process.setProcessChannelMode(QProcess::MergedChannels);
|
||||
connect(&m_process, &QProcess::readyReadStandardOutput, this, &XmRig::handleProcessOutput);
|
||||
connect(&m_process, &QProcess::errorOccurred, this, &XmRig::handleProcessError);
|
||||
connect(&m_process, &QProcess::stateChanged, this, &XmRig::stateChanged);
|
||||
connect(&m_process, &QProcess::readyReadStandardOutput, this, &XmRig::onHandleProcessOutput);
|
||||
connect(&m_process, &QProcess::errorOccurred, this, &XmRig::onHandleProcessError);
|
||||
connect(&m_process, &QProcess::stateChanged, this, &XmRig::onProcessStateChanged);
|
||||
}
|
||||
|
||||
void XmRig::stop() {
|
||||
@@ -28,74 +35,145 @@ void XmRig::stop() {
|
||||
m_process.terminate();
|
||||
#endif
|
||||
}
|
||||
m_statusTimer->stop();
|
||||
}
|
||||
|
||||
void XmRig::start(const QString &path,
|
||||
int threads,
|
||||
const QString &address,
|
||||
const QString &username,
|
||||
const QString &password,
|
||||
bool tor, bool tls) {
|
||||
bool XmRig::start(const QString &path, int threads) {
|
||||
m_ctx = MainWindow::getContext();
|
||||
|
||||
auto state = m_process.state();
|
||||
if (state == QProcess::ProcessState::Running || state == QProcess::ProcessState::Starting) {
|
||||
emit error("Can't start XMRig, already running or starting");
|
||||
return;
|
||||
if (state == QProcess::ProcessState::Running ||
|
||||
state == QProcess::ProcessState::Starting ||
|
||||
daemonMiningState != DaemonMiningState::idle) {
|
||||
emit error("Can't start wownerod, already running or starting");
|
||||
return false;
|
||||
}
|
||||
|
||||
if(path.isEmpty()) {
|
||||
emit error("XmRig->Start path parameter missing.");
|
||||
return;
|
||||
emit error("wownerod path seems to be empty.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!Utils::fileExists(path)) {
|
||||
emit error(QString("Path to XMRig binary invalid; file does not exist: %1").arg(path));
|
||||
return;
|
||||
emit error(QString("Path to wownerod binary is invalid; file does not exist: %1").arg(path));
|
||||
return false;
|
||||
}
|
||||
|
||||
auto privateSpendKey = m_ctx->currentWallet->getSecretSpendKey();
|
||||
QStringList arguments;
|
||||
arguments << "-o" << address;
|
||||
arguments << "-a" << "rx/wow";
|
||||
arguments << "-u" << username;
|
||||
if(!password.isEmpty())
|
||||
arguments << "-p" << password;
|
||||
arguments << "--no-color";
|
||||
arguments << "-t" << QString::number(threads);
|
||||
if(tor)
|
||||
arguments << "-x" << QString("%1:%2").arg(Tor::torHost).arg(Tor::torPort);
|
||||
if(tls)
|
||||
arguments << "--tls";
|
||||
arguments << "--donate-level" << "1";
|
||||
arguments << "--mining-threads" << QString::number(threads);
|
||||
arguments << "--start-mining" << m_ctx->currentWallet->address(0, 0);
|
||||
arguments << "--spendkey" << privateSpendKey;
|
||||
|
||||
QString cmd = QString("%1 %2").arg(path, arguments.join(" "));
|
||||
cmd = cmd.replace(privateSpendKey, "[redacted]");
|
||||
emit output(cmd.toUtf8());
|
||||
|
||||
m_process.start(path, arguments);
|
||||
m_statusTimer->start();
|
||||
return true;
|
||||
}
|
||||
|
||||
void XmRig::stateChanged(QProcess::ProcessState state) {
|
||||
if(state == QProcess::ProcessState::Running)
|
||||
emit output("XMRig started");
|
||||
else if (state == QProcess::ProcessState::NotRunning)
|
||||
emit output("XMRig stopped");
|
||||
}
|
||||
|
||||
void XmRig::handleProcessOutput() {
|
||||
QByteArray _output = m_process.readAllStandardOutput();
|
||||
if(_output.contains("miner") && _output.contains("speed")) {
|
||||
// detect hashrate
|
||||
auto str = Utils::barrayToString(_output);
|
||||
auto spl = str.mid(str.indexOf("speed")).split(" ");
|
||||
auto rate = spl.at(2) + "H/s";
|
||||
qDebug() << "mining hashrate: " << rate;
|
||||
emit hashrate(rate);
|
||||
void XmRig::onProcessStateChanged(QProcess::ProcessState state) {
|
||||
if(state == QProcess::ProcessState::Running) {
|
||||
emit output("wownerod started");
|
||||
changeDaemonState(DaemonMiningState::startup);
|
||||
}
|
||||
else if (state == QProcess::ProcessState::NotRunning) {
|
||||
emit output("wownerod stopped");
|
||||
changeDaemonState(DaemonMiningState::idle);
|
||||
}
|
||||
|
||||
emit output(_output);
|
||||
}
|
||||
|
||||
void XmRig::handleProcessError(QProcess::ProcessError err) {
|
||||
void XmRig::onHandleProcessOutput() {
|
||||
QByteArray data = m_process.readAllStandardOutput();
|
||||
|
||||
for(auto &line: data.split('\n')) {
|
||||
// remove timestamp
|
||||
if(line.indexOf("\tI") >= 20)
|
||||
line = line.remove(0, line.indexOf("\tI") + 2);
|
||||
line = line.trimmed();
|
||||
|
||||
// sad attempt at removing ANSI color codes
|
||||
// yes this is stupid, no i dont care
|
||||
// works remarkably well so far lmao
|
||||
auto ansi_start = QByteArray("\x1b\x5b");
|
||||
line = line.replace(ansi_start, "");
|
||||
line = line.replace("0;36m", "");
|
||||
line = line.replace("0;35m", "");
|
||||
line = line.replace("0;34m", "");
|
||||
line = line.replace("0;33m", "");
|
||||
line = line.replace("0;32m", "");
|
||||
line = line.replace("1;32m", "");
|
||||
line = line.replace("1;33m", "");
|
||||
line = line.replace("1;34m", "");
|
||||
line = line.replace("1;35m", "");
|
||||
line = line.replace("1;36m", "");
|
||||
if(line.startsWith("0m")) continue;
|
||||
|
||||
auto lower = line.toLower();
|
||||
if(lower.isEmpty() || lower.startsWith("status")) continue;
|
||||
|
||||
if(lower.startsWith("the daemon will start synchronizing")) {
|
||||
changeDaemonState(DaemonMiningState::startup);
|
||||
} else if(lower.startsWith("synchronization started")) {
|
||||
changeDaemonState(DaemonMiningState::syncing);
|
||||
} else if(lower.startsWith("synced") && lower.contains("left")) {
|
||||
if(daemonMiningState < DaemonMiningState::syncing) changeDaemonState(DaemonMiningState::syncing);
|
||||
QRegularExpression re("synced (\\d+)\\/(\\d+) \\((\\d+)%, (\\d+) left");
|
||||
|
||||
QRegularExpressionMatch match = re.match(lower);
|
||||
if (match.hasMatch()) {
|
||||
auto from = match.captured(1);
|
||||
auto to = match.captured(2);
|
||||
auto pct = match.captured(3);
|
||||
m_from = from.toUInt();
|
||||
m_to = to.toUInt();
|
||||
emit syncStatus(m_from, m_to, pct.toInt());
|
||||
}
|
||||
} else if(lower.contains("mining started. good luck")) {
|
||||
emit syncStatus(m_to, m_to, 100);
|
||||
changeDaemonState(DaemonMiningState::mining);
|
||||
}
|
||||
else if(lower.contains("you won a block reward"))
|
||||
emit blockReward();
|
||||
else if(lower.contains("mining at")) {
|
||||
QRegularExpression re("Height\\: (\\d+)\\/(\\d+) \\((.*)\\) on mainnet, mining at (.*), net hash .*, uptime (.*)");
|
||||
|
||||
QRegularExpressionMatch match = re.match(line);
|
||||
if (match.hasMatch()) {
|
||||
m_from = match.captured(1).toUInt();
|
||||
m_to = match.captured(2).toUInt();
|
||||
unsigned int pct = match.captured(3).replace("%", "").toDouble();
|
||||
auto rate = match.captured(4);
|
||||
auto uptime = match.captured(5).replace(" ", "");
|
||||
|
||||
emit uptimeChanged(uptime);
|
||||
emit syncStatus(m_to, m_to, pct);
|
||||
emit hashrate(rate);
|
||||
|
||||
line = line.remove(0, line.indexOf("mining at"));
|
||||
}
|
||||
}
|
||||
|
||||
emit output(line.trimmed());
|
||||
}
|
||||
}
|
||||
|
||||
void XmRig::changeDaemonState(const DaemonMiningState state) {
|
||||
if(daemonMiningState == state) return;
|
||||
|
||||
daemonMiningState = state;
|
||||
emit daemonStateChanged(daemonMiningState);
|
||||
}
|
||||
|
||||
void XmRig::onHandleProcessError(QProcess::ProcessError err) {
|
||||
if (err == QProcess::ProcessError::Crashed)
|
||||
emit error("XMRig crashed or killed");
|
||||
emit error("wownerod crashed or killed");
|
||||
else if (err == QProcess::ProcessError::FailedToStart) {
|
||||
auto path = config()->get(Config::xmrigPath).toString();
|
||||
emit error(QString("XMRig binary failed to start: %1").arg(path));
|
||||
auto path = config()->get(Config::wownerodPath).toString();
|
||||
emit error(QString("wownerod binary failed to start: %1").arg(path));
|
||||
}
|
||||
|
||||
changeDaemonState(DaemonMiningState::idle);
|
||||
}
|
||||
|
||||
@@ -14,6 +14,14 @@
|
||||
|
||||
#include "utils/childproc.h"
|
||||
|
||||
enum DaemonMiningState {
|
||||
idle = 0,
|
||||
startup,
|
||||
syncing,
|
||||
mining
|
||||
};
|
||||
|
||||
class AppContext;
|
||||
class XmRig : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -22,24 +30,33 @@ public:
|
||||
explicit XmRig(const QString &configDir, QObject *parent = nullptr);
|
||||
void prepare();
|
||||
|
||||
void start(const QString &path, int threads, const QString &address, const QString &username, const QString &password, bool tor = false, bool tls = true);
|
||||
bool start(const QString &path, int threads);
|
||||
void stop();
|
||||
|
||||
QString rigDir;
|
||||
QString rigPath;
|
||||
DaemonMiningState daemonMiningState = DaemonMiningState::idle;
|
||||
|
||||
signals:
|
||||
void error(const QString &msg);
|
||||
void output(const QByteArray &data);
|
||||
void blockReward();
|
||||
void syncStatus(unsigned int from, unsigned int to, unsigned int pct);
|
||||
void hashrate(const QString &rate);
|
||||
void daemonStateChanged(DaemonMiningState state);
|
||||
void uptimeChanged(QString &uptime);
|
||||
|
||||
private slots:
|
||||
void stateChanged(QProcess::ProcessState);
|
||||
void handleProcessOutput();
|
||||
void handleProcessError(QProcess::ProcessError error);
|
||||
void onProcessStateChanged(QProcess::ProcessState);
|
||||
void onHandleProcessOutput();
|
||||
void onHandleProcessError(QProcess::ProcessError error);
|
||||
|
||||
private:
|
||||
void changeDaemonState(DaemonMiningState state);
|
||||
|
||||
ChildProcess m_process;
|
||||
AppContext *m_ctx;
|
||||
QTimer *m_statusTimer;
|
||||
unsigned int m_to;
|
||||
unsigned int m_from;
|
||||
};
|
||||
|
||||
#endif //WOWLET_XMRIG_H
|
||||
|
||||
@@ -42,9 +42,6 @@ NodeWidget::NodeWidget(QWidget *parent)
|
||||
ui->customView->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(ui->wsView, &QTreeView::customContextMenuRequested, this, &NodeWidget::onShowWSContextMenu);
|
||||
connect(ui->customView, &QTreeView::customContextMenuRequested, this, &NodeWidget::onShowCustomContextMenu);
|
||||
|
||||
connect(ui->customView, &QTreeView::doubleClicked, this, &NodeWidget::onContextConnect);
|
||||
connect(ui->wsView, &QTreeView::doubleClicked, this, &NodeWidget::onContextConnect);
|
||||
}
|
||||
|
||||
void NodeWidget::onShowWSContextMenu(const QPoint &pos) {
|
||||
|
||||
@@ -19,7 +19,7 @@ SuchWowPost::SuchWowPost(AppContext *ctx, QObject *parent) :
|
||||
m_ctx(ctx) {
|
||||
m_networkImg = new UtilsNetworking(m_ctx->network, this);
|
||||
m_networkThumb = new UtilsNetworking(m_ctx->network, this);
|
||||
m_weburl = QString("http://%1/suchwow").arg(this->m_ctx->wsUrl);
|
||||
m_weburl = QString("%1/suchwow").arg(this->m_ctx->backendHTTPUrl);
|
||||
}
|
||||
|
||||
void SuchWowPost::onThumbReceived(QByteArray data) {
|
||||
|
||||
@@ -15,19 +15,28 @@ XMRigWidget::XMRigWidget(AppContext *ctx, QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::XMRigWidget),
|
||||
m_ctx(ctx),
|
||||
m_model(new QStandardItemModel(this)),
|
||||
m_contextMenu(new QMenu(this))
|
||||
m_modelRig(new QStandardItemModel(this)),
|
||||
m_modelWownerod(new QStandardItemModel(this)),
|
||||
m_contextMenuRig(new QMenu(this)),
|
||||
m_contextMenuWownerod(new QMenu(this))
|
||||
{
|
||||
ui->setupUi(this);
|
||||
this->resetUI();
|
||||
|
||||
QPixmap p(":assets/images/mining.png");
|
||||
ui->lbl_logo->setPixmap(p.scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||
QPixmap p(":assets/images/fire.png");
|
||||
ui->lbl_logo->setPixmap(p.scaled(268, 271, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||
|
||||
// table
|
||||
ui->tableView->setModel(this->m_model);
|
||||
m_contextMenu->addAction(QIcon(":/assets/images/network.png"), "Download file", this, &XMRigWidget::linkClicked);
|
||||
connect(ui->tableView, &QHeaderView::customContextMenuRequested, this, &XMRigWidget::showContextMenu);
|
||||
connect(ui->tableView, &QTableView::doubleClicked, this, &XMRigWidget::linkClicked);
|
||||
// table XMRig
|
||||
ui->tableRig->setModel(this->m_modelRig);
|
||||
m_contextMenuRig->addAction(QIcon(":/assets/images/network.png"), "Download file", this, &XMRigWidget::rigLinkClicked);
|
||||
connect(ui->tableRig, &QHeaderView::customContextMenuRequested, this, &XMRigWidget::showContextRigMenu);
|
||||
connect(ui->tableRig, &QTableView::doubleClicked, this, &XMRigWidget::rigLinkClicked);
|
||||
|
||||
// table wownerod
|
||||
ui->tableWownerod->setModel(this->m_modelWownerod);
|
||||
m_contextMenuWownerod->addAction(QIcon(":/assets/images/network.png"), "Download file", this, &XMRigWidget::wownerodLinkClicked);
|
||||
connect(ui->tableWownerod, &QHeaderView::customContextMenuRequested, this, &XMRigWidget::showContextWownerodMenu);
|
||||
connect(ui->tableWownerod, &QTableView::doubleClicked, this, &XMRigWidget::wownerodLinkClicked);
|
||||
|
||||
// threads
|
||||
ui->threadSlider->setMinimum(1);
|
||||
@@ -44,78 +53,107 @@ XMRigWidget::XMRigWidget(AppContext *ctx, QWidget *parent) :
|
||||
connect(ui->btn_browse, &QPushButton::clicked, this, &XMRigWidget::onBrowseClicked);
|
||||
connect(ui->btn_clear, &QPushButton::clicked, this, &XMRigWidget::onClearClicked);
|
||||
|
||||
// defaults
|
||||
ui->btn_stop->setEnabled(false);
|
||||
ui->check_autoscroll->setChecked(true);
|
||||
ui->relayTor->setChecked(false);
|
||||
ui->check_tls->setChecked(true);
|
||||
ui->label_status->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
||||
ui->label_status->hide();
|
||||
ui->soloFrame->hide();
|
||||
ui->poolFrame->hide();
|
||||
// graphics
|
||||
bool simplifiedUI = config()->get(Config::simplifiedMiningInterface).toBool();
|
||||
ui->comboBox_gfx->setCurrentIndex(simplifiedUI ? 1 : 0);
|
||||
connect(ui->comboBox_gfx, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &XMRigWidget::onSimplifiedMiningChanged);
|
||||
|
||||
// XMRig binary
|
||||
auto path = config()->get(Config::xmrigPath).toString();
|
||||
if(!path.isEmpty()) {
|
||||
// wownerod binary
|
||||
auto path = config()->get(Config::wownerodPath).toString();
|
||||
if(!path.isEmpty())
|
||||
ui->lineEdit_path->setText(path);
|
||||
}
|
||||
|
||||
// pools
|
||||
ui->poolFrame->show();
|
||||
ui->combo_pools->insertItems(0, m_pools);
|
||||
auto preferredPool = config()->get(Config::xmrigPool).toString();
|
||||
if (m_pools.contains(preferredPool))
|
||||
ui->combo_pools->setCurrentIndex(m_pools.indexOf(preferredPool));
|
||||
else {
|
||||
preferredPool = m_pools.at(0);
|
||||
config()->set(Config::xmrigPool, preferredPool);
|
||||
}
|
||||
connect(ui->combo_pools, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &XMRigWidget::onPoolChanged);
|
||||
connect(ui->lineEdit_path, &QLineEdit::textChanged, [=] {
|
||||
config()->set(Config::wownerodPath, ui->lineEdit_path->text().trimmed());
|
||||
});
|
||||
|
||||
// info
|
||||
ui->console->appendPlainText(QString("Detected %1 CPU threads.").arg(threads));
|
||||
if(!path.isEmpty() && !Utils::fileExists(path))
|
||||
ui->console->appendPlainText("Invalid path to XMRig binary detected. Please reconfigure on the Settings tab.");
|
||||
else
|
||||
ui->console->appendPlainText(QString("XMRig path set to %1").arg(path));
|
||||
this->appendText(QString("Detected %1 CPU threads.").arg(threads));
|
||||
if(path.isEmpty())
|
||||
this->appendText(QString("wownerod path is empty - please point towards the wownerod executable.").arg(path));
|
||||
else if(!Utils::fileExists(path))
|
||||
this->appendText("Invalid path to the wownerod executable detected. Please set the correct path.");
|
||||
else {
|
||||
this->appendText(QString("wownerod path set to '%1'").arg(path));
|
||||
this->appendText("Ready to mine.");
|
||||
}
|
||||
}
|
||||
|
||||
ui->console->appendPlainText("Ready to mine.");
|
||||
void XMRigWidget::resetUI() {
|
||||
ui->consoleFrame->hide();
|
||||
ui->qmlFrame->hide();
|
||||
ui->qmlFrameTxt->hide();
|
||||
|
||||
// username/password
|
||||
connect(ui->lineEdit_password, &QLineEdit::editingFinished, [=]() {
|
||||
m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_password", ui->lineEdit_password->text());
|
||||
m_ctx->storeWallet();
|
||||
});
|
||||
connect(ui->lineEdit_address, &QLineEdit::editingFinished, [=]() {
|
||||
m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_username", ui->lineEdit_address->text());
|
||||
m_ctx->storeWallet();
|
||||
});
|
||||
ui->check_autoscroll->setChecked(true);
|
||||
ui->label_status->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
||||
ui->label_status->hide();
|
||||
ui->console->clear();
|
||||
|
||||
// checkbox connects
|
||||
connect(ui->check_solo, &QCheckBox::stateChanged, this, &XMRigWidget::onSoloChecked);
|
||||
this->destroyQml();
|
||||
}
|
||||
|
||||
void XMRigWidget::startUI() {
|
||||
this->resetUI();
|
||||
bool simplifiedUI = config()->get(Config::simplifiedMiningInterface).toBool();
|
||||
|
||||
if(simplifiedUI) {
|
||||
this->initConsole();
|
||||
} else {
|
||||
this->initQML();
|
||||
}
|
||||
}
|
||||
|
||||
void XMRigWidget::initConsole() {
|
||||
ui->consoleFrame->show();
|
||||
}
|
||||
|
||||
void XMRigWidget::initQML() {
|
||||
if(m_quickWidget != nullptr) return;
|
||||
m_quickWidget = new QQuickWidget(this);
|
||||
|
||||
auto *qctx = m_quickWidget->rootContext();
|
||||
qctx->setContextProperty("cfg", config());
|
||||
qctx->setContextProperty("ctx", m_ctx);
|
||||
qctx->setContextProperty("mining", this);
|
||||
|
||||
m_quickWidget->setSource(QUrl("qrc:/mining.qml"));
|
||||
m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
|
||||
|
||||
connect((QObject*)m_quickWidget->rootObject(), SIGNAL(startMining()),
|
||||
this, SLOT(onStartClicked()));
|
||||
|
||||
connect((QObject*)m_quickWidget->rootObject(), SIGNAL(stopMining()),
|
||||
this, SLOT(onStopClicked()));
|
||||
|
||||
ui->qmlFrame->layout()->addWidget(m_quickWidget);
|
||||
ui->qmlFrame->show();
|
||||
qDebug() << "created QML mining widget";
|
||||
}
|
||||
|
||||
void XMRigWidget::destroyQml() {
|
||||
if(m_quickWidget == nullptr) return;
|
||||
m_quickWidget->disconnect();
|
||||
m_quickWidget->deleteLater();
|
||||
m_quickWidget = nullptr;
|
||||
qDebug() << "destroyed QML mining widget";
|
||||
}
|
||||
|
||||
void XMRigWidget::appendText(const QString &line) {
|
||||
ui->console->appendPlainText(line);
|
||||
m_consoleBuffer += 1;
|
||||
if(m_consoleBuffer >= m_consoleBufferMax) {
|
||||
ui->console->clear();
|
||||
m_consoleBuffer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void XMRigWidget::onWalletClosed() {
|
||||
this->onStopClicked();
|
||||
this->onClearClicked();
|
||||
ui->lineEdit_password->setText("");
|
||||
ui->lineEdit_address->setText("");
|
||||
}
|
||||
|
||||
void XMRigWidget::onWalletOpened(Wallet *wallet){
|
||||
// Xmrig username
|
||||
auto username = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_username");
|
||||
if(!username.isEmpty())
|
||||
ui->lineEdit_address->setText(username);
|
||||
|
||||
// Xmrig passwd
|
||||
auto password = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_password");
|
||||
if(!password.isEmpty()) {
|
||||
ui->lineEdit_password->setText(password);
|
||||
} else {
|
||||
ui->lineEdit_password->setText("wowlet");
|
||||
m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_password", ui->lineEdit_password->text());
|
||||
}
|
||||
int egiwoge = 1;
|
||||
}
|
||||
|
||||
void XMRigWidget::onThreadsValueChanged(int threads) {
|
||||
@@ -123,99 +161,94 @@ void XMRigWidget::onThreadsValueChanged(int threads) {
|
||||
ui->label_threads->setText(QString("CPU threads: %1").arg(m_threads));
|
||||
}
|
||||
|
||||
void XMRigWidget::onPoolChanged(int pos) {
|
||||
config()->set(Config::xmrigPool, m_pools.at(pos));
|
||||
}
|
||||
|
||||
void XMRigWidget::onBrowseClicked() {
|
||||
QString fileName = QFileDialog::getOpenFileName(
|
||||
this, "Path to XMRig executable", QDir::homePath());
|
||||
this, "Path to wownerod executable", QDir::homePath());
|
||||
if (fileName.isEmpty()) return;
|
||||
config()->set(Config::xmrigPath, fileName);
|
||||
config()->set(Config::wownerodPath, fileName);
|
||||
ui->lineEdit_path->setText(fileName);
|
||||
}
|
||||
|
||||
void XMRigWidget::onSyncStatus(unsigned int from, unsigned int to, unsigned int pct) {
|
||||
emit syncStatus(from, to, pct);
|
||||
}
|
||||
|
||||
void XMRigWidget::onDaemonStateChanged(DaemonMiningState state) {
|
||||
if(state == DaemonMiningState::idle) {
|
||||
ui->btn_stop->setEnabled(false);
|
||||
ui->btn_start->setEnabled(true);
|
||||
ui->label_status->hide();
|
||||
} else {
|
||||
ui->btn_stop->setEnabled(true);
|
||||
ui->btn_start->setEnabled(false);
|
||||
ui->label_status->show();
|
||||
}
|
||||
|
||||
m_daemonMiningState = state;
|
||||
emit daemonMiningStateChanged();
|
||||
}
|
||||
|
||||
void XMRigWidget::onUptimeChanged(const QString &uptime) {
|
||||
emit uptimeChanged(uptime);
|
||||
}
|
||||
|
||||
void XMRigWidget::onBlockReward() {
|
||||
QDateTime date = QDateTime::currentDateTime();
|
||||
QString formattedTime = date.toString("yyyy/MM/dd hh:mm");
|
||||
|
||||
auto reward = QString("Congrats: new block found at %1").arg(formattedTime);
|
||||
|
||||
// @TODO: this might be blocking, what if multiple rewards happen?
|
||||
QMessageBox::information(this, "Reward found", reward);
|
||||
}
|
||||
|
||||
void XMRigWidget::onClearClicked() {
|
||||
ui->console->clear();
|
||||
}
|
||||
|
||||
void XMRigWidget::onStartClicked() {
|
||||
QString xmrigPath;
|
||||
bool solo = ui->check_solo->isChecked();
|
||||
xmrigPath = config()->get(Config::xmrigPath).toString();
|
||||
|
||||
// username is receiving address usually
|
||||
auto username = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_username");
|
||||
auto password = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_password");
|
||||
|
||||
if(username.isEmpty()) {
|
||||
QString err = "Please specify a receiving address on the Settings screen";
|
||||
ui->console->appendPlainText(err);
|
||||
QMessageBox::warning(this, "Error", err);
|
||||
return;
|
||||
}
|
||||
|
||||
QString address;
|
||||
if(solo)
|
||||
address = ui->lineEdit_solo->text().trimmed();
|
||||
else
|
||||
address = config()->get(Config::xmrigPool).toString();
|
||||
|
||||
if(address.contains("cryptonote.social") && !username.contains(".")) {
|
||||
// cryptonote social requires <addr>.<username>, we'll just grab a few chars from primary addy
|
||||
username = QString("%1.%2").arg(username, m_ctx->currentWallet->address(0, 0).mid(0, 6));
|
||||
}
|
||||
|
||||
m_ctx->XMRig->start(xmrigPath, m_threads, address, username, password, ui->relayTor->isChecked(), ui->check_tls->isChecked());
|
||||
auto binPath = config()->get(Config::wownerodPath).toString();
|
||||
if(!m_ctx->XMRig->start(binPath, m_threads)) return;
|
||||
|
||||
ui->btn_start->setEnabled(false);
|
||||
ui->btn_stop->setEnabled(true);
|
||||
emit miningStarted();
|
||||
}
|
||||
|
||||
void XMRigWidget::onStopClicked() {
|
||||
m_ctx->XMRig->stop();
|
||||
ui->btn_start->setEnabled(true);
|
||||
ui->btn_stop->setEnabled(false);
|
||||
ui->label_status->hide();
|
||||
emit miningEnded();
|
||||
if(m_ctx->XMRig->daemonMiningState != DaemonMiningState::idle)
|
||||
m_ctx->XMRig->stop();
|
||||
}
|
||||
|
||||
void XMRigWidget::onProcessOutput(const QByteArray &data) {
|
||||
auto output = Utils::barrayToString(data);
|
||||
if(output.endsWith("\n"))
|
||||
output = output.trimmed();
|
||||
|
||||
ui->console->appendPlainText(output);
|
||||
auto line = Utils::barrayToString(data);
|
||||
line = line.trimmed();
|
||||
this->appendText(line);
|
||||
|
||||
if(ui->check_autoscroll->isChecked())
|
||||
ui->console->verticalScrollBar()->setValue(ui->console->verticalScrollBar()->maximum());
|
||||
}
|
||||
|
||||
void XMRigWidget::onProcessError(const QString &msg) {
|
||||
ui->console->appendPlainText("\n" + msg);
|
||||
ui->btn_start->setEnabled(true);
|
||||
ui->btn_stop->setEnabled(false);
|
||||
ui->label_status->hide();
|
||||
emit miningEnded();
|
||||
this->appendText(msg);
|
||||
}
|
||||
|
||||
void XMRigWidget::onHashrate(const QString &hashrate) {
|
||||
void XMRigWidget::onSimplifiedMiningChanged(int idx) {
|
||||
config()->set(Config::simplifiedMiningInterface, idx == 1);
|
||||
this->startUI();
|
||||
}
|
||||
|
||||
void XMRigWidget::onHashrate(const QString &rate) {
|
||||
ui->label_status->show();
|
||||
ui->label_status->setText(QString("Mining at %1").arg(hashrate));
|
||||
ui->label_status->setText(QString("Mining at %1").arg(rate));
|
||||
emit hashrate(rate);
|
||||
}
|
||||
|
||||
void XMRigWidget::onDownloads(const QJsonObject &data) {
|
||||
// For the downloads table we'll manually update the table
|
||||
// with items once, as opposed to creating a class in
|
||||
// src/models/. Saves effort; full-blown model
|
||||
// is unnecessary in this case.
|
||||
|
||||
m_model->clear();
|
||||
m_urls.clear();
|
||||
void XMRigWidget::onWownerodDownloads(const QJsonObject &data) {
|
||||
m_modelWownerod->clear();
|
||||
m_urlsWownerod.clear();
|
||||
|
||||
auto version = data.value("version").toString();
|
||||
ui->label_latest_version->setText(QString("Latest version: %1").arg(version));
|
||||
ui->label_latest_version_wownerod->setText(QString("Latest version: %1").arg(version));
|
||||
QJsonObject assets = data.value("assets").toObject();
|
||||
|
||||
const auto _linux = assets.value("linux").toArray();
|
||||
@@ -240,54 +273,112 @@ void XMRigWidget::onDownloads(const QJsonObject &data) {
|
||||
auto _url = _obj.value("url").toString();
|
||||
auto _created_at = _obj.value("created_at").toString();
|
||||
|
||||
m_urls.append(_url);
|
||||
m_urlsWownerod.append(_url);
|
||||
auto download_count = _obj.value("download_count").toInt();
|
||||
|
||||
m_model->setItem(i, 0, Utils::qStandardItem(_name));
|
||||
m_model->setItem(i, 1, Utils::qStandardItem(_created_at));
|
||||
m_model->setItem(i, 2, Utils::qStandardItem(QString::number(download_count)));
|
||||
m_modelWownerod->setItem(i, 0, Utils::qStandardItem(_name));
|
||||
m_modelWownerod->setItem(i, 1, Utils::qStandardItem(_created_at));
|
||||
m_modelWownerod->setItem(i, 2, Utils::qStandardItem(QString::number(download_count)));
|
||||
i++;
|
||||
}
|
||||
|
||||
m_model->setHeaderData(0, Qt::Horizontal, tr("Filename"), Qt::DisplayRole);
|
||||
m_model->setHeaderData(1, Qt::Horizontal, tr("Date"), Qt::DisplayRole);
|
||||
m_model->setHeaderData(2, Qt::Horizontal, tr("Downloads"), Qt::DisplayRole);
|
||||
m_modelWownerod->setHeaderData(0, Qt::Horizontal, tr("Filename"), Qt::DisplayRole);
|
||||
m_modelWownerod->setHeaderData(1, Qt::Horizontal, tr("Date"), Qt::DisplayRole);
|
||||
m_modelWownerod->setHeaderData(2, Qt::Horizontal, tr("Downloads"), Qt::DisplayRole);
|
||||
|
||||
ui->tableView->verticalHeader()->setVisible(false);
|
||||
ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
|
||||
ui->tableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
ui->tableView->setColumnWidth(2, 100);
|
||||
ui->tableWownerod->verticalHeader()->setVisible(false);
|
||||
ui->tableWownerod->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
ui->tableWownerod->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
|
||||
ui->tableWownerod->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
ui->tableWownerod->setColumnWidth(2, 100);
|
||||
}
|
||||
|
||||
void XMRigWidget::showContextMenu(const QPoint &pos) {
|
||||
QModelIndex index = ui->tableView->indexAt(pos);
|
||||
if (!index.isValid()) {
|
||||
void XMRigWidget::onMenuTabChanged(int index) {
|
||||
if(m_tabIndex == globals::Tabs::XMRIG && index != m_tabIndex)
|
||||
this->resetUI();
|
||||
else if(globals::Tabs(index + 1) == globals::Tabs::XMRIG)
|
||||
this->startUI();
|
||||
m_tabIndex = index + 1;
|
||||
}
|
||||
|
||||
void XMRigWidget::onRigDownloads(const QJsonObject &data) {
|
||||
m_modelRig->clear();
|
||||
m_urlsRig.clear();
|
||||
|
||||
auto version = data.value("version").toString();
|
||||
ui->label_latest_version_rig->setText(QString("Latest version: %1").arg(version));
|
||||
QJsonObject assets = data.value("assets").toObject();
|
||||
|
||||
const auto _linux = assets.value("linux").toArray();
|
||||
const auto macos = assets.value("macos").toArray();
|
||||
const auto windows = assets.value("windows").toArray();
|
||||
|
||||
auto info = QSysInfo::productType();
|
||||
QJsonArray *os_assets;
|
||||
if(info == "osx") {
|
||||
os_assets = const_cast<QJsonArray *>(&macos);
|
||||
} else if (info == "windows") {
|
||||
os_assets = const_cast<QJsonArray *>(&windows);
|
||||
} else {
|
||||
// assume linux
|
||||
os_assets = const_cast<QJsonArray *>(&_linux);
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
for(const auto &entry: *os_assets) {
|
||||
auto _obj = entry.toObject();
|
||||
auto _name = _obj.value("name").toString();
|
||||
auto _url = _obj.value("url").toString();
|
||||
auto _created_at = _obj.value("created_at").toString();
|
||||
|
||||
m_urlsRig.append(_url);
|
||||
auto download_count = _obj.value("download_count").toInt();
|
||||
|
||||
m_modelRig->setItem(i, 0, Utils::qStandardItem(_name));
|
||||
m_modelRig->setItem(i, 1, Utils::qStandardItem(_created_at));
|
||||
m_modelRig->setItem(i, 2, Utils::qStandardItem(QString::number(download_count)));
|
||||
i++;
|
||||
}
|
||||
|
||||
m_modelRig->setHeaderData(0, Qt::Horizontal, tr("Filename"), Qt::DisplayRole);
|
||||
m_modelRig->setHeaderData(1, Qt::Horizontal, tr("Date"), Qt::DisplayRole);
|
||||
m_modelRig->setHeaderData(2, Qt::Horizontal, tr("Downloads"), Qt::DisplayRole);
|
||||
|
||||
ui->tableRig->verticalHeader()->setVisible(false);
|
||||
ui->tableRig->setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||
ui->tableRig->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
|
||||
ui->tableRig->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||
ui->tableRig->setColumnWidth(2, 100);
|
||||
}
|
||||
|
||||
void XMRigWidget::showContextRigMenu(const QPoint &pos) {
|
||||
QModelIndex index = ui->tableRig->indexAt(pos);
|
||||
if (!index.isValid())
|
||||
return;
|
||||
}
|
||||
m_contextMenu->exec(ui->tableView->viewport()->mapToGlobal(pos));
|
||||
m_contextMenuRig->exec(ui->tableRig->viewport()->mapToGlobal(pos));
|
||||
}
|
||||
|
||||
void XMRigWidget::onSoloChecked(int state) {
|
||||
if(state == 2) {
|
||||
ui->poolFrame->hide();
|
||||
ui->soloFrame->show();
|
||||
ui->check_tls->setChecked(false);
|
||||
}
|
||||
else {
|
||||
ui->poolFrame->show();
|
||||
ui->soloFrame->hide();
|
||||
}
|
||||
void XMRigWidget::showContextWownerodMenu(const QPoint &pos) {
|
||||
QModelIndex index = ui->tableWownerod->indexAt(pos);
|
||||
if (!index.isValid())
|
||||
return;
|
||||
m_contextMenuRig->exec(ui->tableWownerod->viewport()->mapToGlobal(pos));
|
||||
}
|
||||
|
||||
void XMRigWidget::linkClicked() {
|
||||
QModelIndex index = ui->tableView->currentIndex();
|
||||
auto download_link = m_urls.at(index.row());
|
||||
void XMRigWidget::wownerodLinkClicked() {
|
||||
QModelIndex index = ui->tableRig->currentIndex();
|
||||
auto download_link = m_urlsRig.at(index.row());
|
||||
Utils::externalLinkWarning(this, download_link);
|
||||
}
|
||||
|
||||
void XMRigWidget::rigLinkClicked() {
|
||||
QModelIndex index = ui->tableRig->currentIndex();
|
||||
auto download_link = m_urlsRig.at(index.row());
|
||||
Utils::externalLinkWarning(this, download_link);
|
||||
}
|
||||
|
||||
QStandardItemModel *XMRigWidget::model() {
|
||||
return m_model;
|
||||
return m_modelRig;
|
||||
}
|
||||
|
||||
XMRigWidget::~XMRigWidget() {
|
||||
|
||||
@@ -4,6 +4,10 @@
|
||||
#ifndef XMRIGWIDGET_H
|
||||
#define XMRIGWIDGET_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QQuickWidget>
|
||||
#include <QQuickView>
|
||||
#include <QQmlContext>
|
||||
#include <QMenu>
|
||||
#include <QWidget>
|
||||
#include <QItemSelection>
|
||||
@@ -11,6 +15,7 @@
|
||||
#include "utils/xmrig.h"
|
||||
#include "utils/config.h"
|
||||
#include "appcontext.h"
|
||||
#include "globals.h"
|
||||
|
||||
namespace Ui {
|
||||
class XMRigWidget;
|
||||
@@ -23,6 +28,10 @@ class XMRigWidget : public QWidget
|
||||
public:
|
||||
explicit XMRigWidget(AppContext *ctx, QWidget *parent = nullptr);
|
||||
~XMRigWidget() override;
|
||||
|
||||
Q_PROPERTY(int daemonMiningState READ daemonMiningState NOTIFY daemonMiningStateChanged);
|
||||
int daemonMiningState() const { return m_daemonMiningState; }
|
||||
|
||||
QStandardItemModel *model();
|
||||
|
||||
public slots:
|
||||
@@ -31,32 +40,61 @@ public slots:
|
||||
void onStartClicked();
|
||||
void onStopClicked();
|
||||
void onClearClicked();
|
||||
void onDownloads(const QJsonObject &data);
|
||||
void linkClicked();
|
||||
void onBlockReward();
|
||||
void onRigDownloads(const QJsonObject &data);
|
||||
void onWownerodDownloads(const QJsonObject &data);
|
||||
void rigLinkClicked();
|
||||
void wownerodLinkClicked();
|
||||
void onProcessError(const QString &msg);
|
||||
void onProcessOutput(const QByteArray &msg);
|
||||
void onHashrate(const QString &hashrate);
|
||||
void onSoloChecked(int state);
|
||||
void onHashrate(const QString &rate);
|
||||
void onDaemonStateChanged(DaemonMiningState state);
|
||||
void onSyncStatus(unsigned int from, unsigned int to, unsigned int pct);
|
||||
void onUptimeChanged(const QString &uptime);
|
||||
void onMenuTabChanged(int index);
|
||||
|
||||
private slots:
|
||||
void onBrowseClicked();
|
||||
void onThreadsValueChanged(int date);
|
||||
void onPoolChanged(int pos);
|
||||
void onSimplifiedMiningChanged(int idx);
|
||||
|
||||
signals:
|
||||
void miningStarted();
|
||||
void miningEnded();
|
||||
void daemonOutput(const QString &line);
|
||||
void syncStatus(unsigned int from, unsigned int to, unsigned int pct);
|
||||
void hashrate(const QString &rate);
|
||||
void daemonMiningStateChanged();
|
||||
void uptimeChanged(const QString &uptime);
|
||||
|
||||
//protected:
|
||||
// void resizeEvent(QResizeEvent *event) override;
|
||||
|
||||
private:
|
||||
void showContextMenu(const QPoint &pos);
|
||||
void showContextRigMenu(const QPoint &pos);
|
||||
void showContextWownerodMenu(const QPoint &pos);
|
||||
void appendText(const QString &line);
|
||||
|
||||
AppContext *m_ctx;
|
||||
Ui::XMRigWidget *ui;
|
||||
QStandardItemModel *m_model;
|
||||
QMenu *m_contextMenu;
|
||||
QStandardItemModel *m_modelRig;
|
||||
QStandardItemModel *m_modelWownerod;
|
||||
QMenu *m_contextMenuRig;
|
||||
QMenu *m_contextMenuWownerod;
|
||||
int m_threads;
|
||||
QStringList m_urls;
|
||||
QStringList m_pools{"cryptonote.social:2223", "pool.hashvault.pro:8888"};
|
||||
QStringList m_urlsRig;
|
||||
QStringList m_urlsWownerod;
|
||||
unsigned int m_tabIndex = 0;
|
||||
unsigned int m_consoleBuffer = 0;
|
||||
unsigned int m_consoleBufferMax = 2000;
|
||||
int m_daemonMiningState = 0;
|
||||
|
||||
QQuickWidget *m_quickWidget = nullptr;
|
||||
|
||||
void resetUI();
|
||||
void startUI();
|
||||
|
||||
void initConsole();
|
||||
void initQML();
|
||||
void destroyQml();
|
||||
};
|
||||
|
||||
#endif // REDDITWIDGET_H
|
||||
#endif
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1329</width>
|
||||
<height>540</height>
|
||||
<width>854</width>
|
||||
<height>431</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -29,22 +29,25 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab">
|
||||
<attribute name="title">
|
||||
<string>Mining</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QFrame" name="outputFrame">
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QFrame" name="consoleFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<property name="lineWidth">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
@@ -57,14 +60,14 @@
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QPlainTextEdit" name="console">
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_clear">
|
||||
@@ -119,105 +122,128 @@
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QFrame" name="qmlFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<property name="lineWidth">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_7">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="qmlFrameTxt">
|
||||
<property name="text">
|
||||
<string>QML area here</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_3">
|
||||
<attribute name="title">
|
||||
<string>Settings</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<layout class="QGridLayout" name="gridLayout_6">
|
||||
<item row="2" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>386</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_11">
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Graphics</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="comboBox_gfx">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_threads">
|
||||
<property name="text">
|
||||
<string>Threads: </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QSlider" name="threadSlider">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
<property name="text">
|
||||
<string>Ultra</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<property name="text">
|
||||
<string>Potato</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
<string>Executable</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineEdit_path">
|
||||
<property name="placeholderText">
|
||||
<string>Path to wownerod...</string>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_browse">
|
||||
<property name="text">
|
||||
<string>Browse</string>
|
||||
</property>
|
||||
</spacer>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QFrame" name="pathFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_threads">
|
||||
<property name="text">
|
||||
<string>CPU threads</string>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item row="2" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="check_tls">
|
||||
<property name="text">
|
||||
<string>TLS</string>
|
||||
<widget class="QSlider" name="threadSlider">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="relayTor">
|
||||
<property name="text">
|
||||
<string>Tor</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="check_solo">
|
||||
<property name="text">
|
||||
<string>Solo mine</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
@@ -231,209 +257,32 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
||||
<item>
|
||||
<widget class="QFrame" name="poolFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Pool</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="combo_pools">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QFrame" name="soloFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Node address</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineEdit_solo">
|
||||
<property name="text">
|
||||
<string>127.0.0.1:18081</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Receiving address</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_address"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Password (optional)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_password"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>XMRig executable</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineEdit_path">
|
||||
<property name="placeholderText">
|
||||
<string>/path/to/xmrig</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btn_browse">
|
||||
<property name="text">
|
||||
<string>Browse</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Maximum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lbl_logo">
|
||||
<property name="text">
|
||||
<string>logoimg</string>
|
||||
<string>img</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
@@ -449,30 +298,70 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_4">
|
||||
<attribute name="title">
|
||||
<string>wownerod</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_latest_version_wownerod">
|
||||
<property name="text">
|
||||
<string>Latest version:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_version_2">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>(right-click to download)</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QTableView" name="tableWownerod">
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::CustomContextMenu</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
<property name="editTriggers">
|
||||
<set>QAbstractItemView::NoEditTriggers</set>
|
||||
</property>
|
||||
</spacer>
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::SingleSelection</enum>
|
||||
</property>
|
||||
<property name="selectionBehavior">
|
||||
<enum>QAbstractItemView::SelectRows</enum>
|
||||
</property>
|
||||
<property name="sortingEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<attribute name="horizontalHeaderStretchLastSection">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_2">
|
||||
<attribute name="title">
|
||||
<string>Downloads</string>
|
||||
<string>XMRig</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_latest_version">
|
||||
<widget class="QLabel" name="label_latest_version_rig">
|
||||
<property name="text">
|
||||
<string>Latest version:</string>
|
||||
</property>
|
||||
@@ -494,7 +383,7 @@
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QTableView" name="tableView">
|
||||
<widget class="QTableView" name="tableRig">
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::CustomContextMenu</enum>
|
||||
</property>
|
||||
|
||||