diff --git a/.gitignore b/.gitignore index 84fc73b..c299741 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ workspace.code-workspace *.xcsettings .DS_Store *.mak -zcashd +hushd IDEWorkspaceChecks.plist *.sln node_modules diff --git a/README.md b/README.md index 04c69e8..bf19822 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -silentdragon-lite is z-Addr first, Sapling compatible wallet lightwallet for Zcash +silentdragon-lite is z-Addr first, Sapling compatible wallet lightwallet for hush ## Compiling from source * silentdragon is written in C++ 14, and can be compiled with g++/clang++/visual c++. diff --git a/application.qrc b/application.qrc index 33408fa..9ed8978 100644 --- a/application.qrc +++ b/application.qrc @@ -9,7 +9,7 @@ res/icon.ico - res/zcashdlogo.gif + res/hushdlogo.gif res/logobig.gif diff --git a/compile_commands.json b/compile_commands.json index bf51525..141161c 100644 --- a/compile_commands.json +++ b/compile_commands.json @@ -2914,226 +2914,6 @@ "directory": "/home/denio/silentdragon-lite", "file": "/home/denio/silentdragon-lite/singleapplication/singleapplication_p.h" }, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_requestdialog.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_requestdialog.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_recurringmultiple.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_recurringmultiple.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_mainwindow.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_mainwindow.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_settings.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_settings.h" -}, { "arguments": [ "clang", @@ -3189,501 +2969,6 @@ "directory": "/home/denio/silentdragon-lite", "file": "/home/denio/silentdragon-lite/src/ui_recurringpayments.h" }, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_createzcashconfdialog.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_createzcashconfdialog.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_privkey.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_privkey.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_connection.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_connection.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_addressbook.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_addressbook.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_migration.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_migration.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_about.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_about.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_viewalladdresses.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_viewalladdresses.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_mobileappconnector.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_mobileappconnector.h" -}, -{ - "arguments": [ - "clang", - "-c", - "-m64", - "-target", - "x86_64-linux-gnu", - "-std=gnu++14", - "-fcxx-exceptions", - "-fexceptions", - "-DQT_DEPRECATED_WARNINGS", - "-DQAPPLICATION_CLASS=QApplication", - "-DQT_NO_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_WEBSOCKETS_LIB", - "-DQT_NETWORK_LIB", - "-DQT_CORE_LIB", - "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", - "-fPIC", - "-I", - "/home/denio/silentdragon-lite", - "-I", - "/home/denio/silentdragon-lite/src/3rdparty", - "-I", - "/home/denio/silentdragon-lite/src", - "-I", - "/home/denio/silentdragon-lite/singleapplication", - "-I", - "/home/denio/silentdragon-lite/res", - "-I", - "/usr/include/x86_64-linux-gnu/qt5", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtGui", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", - "-I", - "/usr/include/x86_64-linux-gnu/qt5/QtCore", - "-I", - "/home/denio/silentdragon-lite/bin", - "-I", - "/usr/include/libdrm", - "-I", - "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", - "-x", - "c++-header", - "/home/denio/silentdragon-lite/src/ui_recurringdialog.h" - ], - "directory": "/home/denio/silentdragon-lite", - "file": "/home/denio/silentdragon-lite/src/ui_recurringdialog.h" -}, { "arguments": [ "clang", @@ -3794,6 +3079,116 @@ "directory": "/home/denio/silentdragon-lite", "file": "/home/denio/silentdragon-lite/src/ui_newrecurring.h" }, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_viewalladdresses.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_viewalladdresses.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_about.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_about.h" +}, { "arguments": [ "clang", @@ -3848,5 +3243,610 @@ ], "directory": "/home/denio/silentdragon-lite", "file": "/home/denio/silentdragon-lite/src/ui_memodialog.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_addressbook.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_addressbook.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_recurringdialog.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_recurringdialog.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_requestdialog.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_requestdialog.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_privkey.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_privkey.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_mobileappconnector.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_mobileappconnector.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_createhushconfdialog.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_createhushconfdialog.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_recurringmultiple.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_recurringmultiple.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_migration.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_migration.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_mainwindow.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_mainwindow.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_connection.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_connection.h" +}, +{ + "arguments": [ + "clang", + "-c", + "-m64", + "-target", + "x86_64-linux-gnu", + "-std=gnu++14", + "-fcxx-exceptions", + "-fexceptions", + "-DQT_DEPRECATED_WARNINGS", + "-DQAPPLICATION_CLASS=QApplication", + "-DQT_NO_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_WEBSOCKETS_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-DBOOST_TYPE_INDEX_CTTI_USER_DEFINED_PARSING=(39, 1, true, \"T = \")", + "-fPIC", + "-I", + "/home/denio/silentdragon-lite", + "-I", + "/home/denio/silentdragon-lite/src/3rdparty", + "-I", + "/home/denio/silentdragon-lite/src", + "-I", + "/home/denio/silentdragon-lite/singleapplication", + "-I", + "/home/denio/silentdragon-lite/res", + "-I", + "/usr/include/x86_64-linux-gnu/qt5", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWidgets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtGui", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtWebSockets", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtNetwork", + "-I", + "/usr/include/x86_64-linux-gnu/qt5/QtCore", + "-I", + "/home/denio/silentdragon-lite/bin", + "-I", + "/usr/include/libdrm", + "-I", + "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++", + "-x", + "c++-header", + "/home/denio/silentdragon-lite/src/ui_settings.h" + ], + "directory": "/home/denio/silentdragon-lite", + "file": "/home/denio/silentdragon-lite/src/ui_settings.h" } ] \ No newline at end of file diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 0ecef54..b076e92 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1051,7 +1051,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=8c9523ad90d7f9b6f4da362f34e3431a27de0532)", + "silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=1011ff7c7c6d5fe7de078194538ae5a2a0e5e461)", ] [[package]] @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "silentdragonlitelib" version = "0.1.0" -source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=8c9523ad90d7f9b6f4da362f34e3431a27de0532#8c9523ad90d7f9b6f4da362f34e3431a27de0532" +source = "git+https://github.com/DenioD/silentdragonlite-cli?rev=1011ff7c7c6d5fe7de078194538ae5a2a0e5e461#1011ff7c7c6d5fe7de078194538ae5a2a0e5e461" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/DenioD/librustzcash.git?rev=44a1c3981df37b73d87f0e625ca3557d8534e6f3)", @@ -2481,7 +2481,7 @@ dependencies = [ "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=8c9523ad90d7f9b6f4da362f34e3431a27de0532)" = "" +"checksum silentdragonlitelib 0.1.0 (git+https://github.com/DenioD/silentdragonlite-cli?rev=1011ff7c7c6d5fe7de078194538ae5a2a0e5e461)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum sodiumoxide 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585232e78a4fc18133eef9946d3080befdf68b906c51b621531c37e91787fa2b" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index a82aef5..79ecfaa 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "qtlib" version = "0.1.0" -authors = ["silentdragon"] +authors = ["zecwallet"] edition = "2018" [lib] @@ -11,4 +11,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" -silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "813ba56b8e963a1a1b53c4d66ff392e721b616ec" } \ No newline at end of file +silentdragonlitelib = { git = "https://github.com/DenioD/silentdragonlite-cli", rev = "1011ff7c7c6d5fe7de078194538ae5a2a0e5e461" } \ No newline at end of file diff --git a/res/Info.plist b/res/Info.plist index 00a52d0..fbd864e 100644 --- a/res/Info.plist +++ b/res/Info.plist @@ -29,10 +29,10 @@ CFBundleURLName - zcash URI + hush URI CFBundleURLSchemes - zcash + hush diff --git a/res/SIGNATURES_README b/res/SIGNATURES_README index 3295811..e224971 100644 --- a/res/SIGNATURES_README +++ b/res/SIGNATURES_README @@ -5,7 +5,7 @@ sha256sum -c sha256sum-vX.Y.Z.txt Verify signatures: 1. First, import the public key (Available on GitHub - at https://github.com/ZcashFoundation/silentdragon/blob/master/public_key.asc) + at https://github.com/hushFoundation/silentdragon/blob/master/public_key.asc) gpg --import public_key.asc 2. Verify signature diff --git a/res/hushdlogo.gif b/res/hushdlogo.gif new file mode 100644 index 0000000..0dea384 Binary files /dev/null and b/res/hushdlogo.gif differ diff --git a/res/icon.ico b/res/icon.ico index db01908..717c151 100644 Binary files a/res/icon.ico and b/res/icon.ico differ diff --git a/res/logo.icns b/res/logo.icns index 2dd1134..ee66f5c 100644 Binary files a/res/logo.icns and b/res/logo.icns differ diff --git a/res/logobig.gif b/res/logobig.gif index 1abe1c1..e3a1d57 100644 Binary files a/res/logobig.gif and b/res/logobig.gif differ diff --git a/res/paymentreq.gif b/res/paymentreq.gif index f451982..414bd64 100644 Binary files a/res/paymentreq.gif and b/res/paymentreq.gif differ diff --git a/res/zcashdlogo.gif b/res/zcashdlogo.gif deleted file mode 100644 index bde1631..0000000 Binary files a/res/zcashdlogo.gif and /dev/null differ diff --git a/res/zec_qt_wallet_de.ts b/res/zec_qt_wallet_de.ts index 6b9e533..c4ac0ae 100644 --- a/res/zec_qt_wallet_de.ts +++ b/res/zec_qt_wallet_de.ts @@ -262,7 +262,7 @@ - zcashd + hushd YOUR_TRANSLATION_HERE @@ -400,7 +400,7 @@ - Pay zcash &URI... + Pay hush &URI... @@ -420,7 +420,7 @@ - Request zcash... + Request hush... @@ -430,17 +430,17 @@ - Tor configuration is available only when running an embedded zcashd. + Tor configuration is available only when running an embedded hushd. - You're using an external zcashd. Please restart zcashd with -rescan + You're using an external hushd. Please restart hushd with -rescan - You're using an external zcashd. Please restart zcashd with -reindex + You're using an external hushd. Please restart hushd with -reindex @@ -515,17 +515,17 @@ - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y - Paste Zcash URI + Paste hush URI @@ -535,7 +535,7 @@ - zcashd is not yet ready. Please wait for the UI to load + hushd is not yet ready. Please wait for the UI to load @@ -565,7 +565,7 @@ - The keys will be imported into your connected zcashd node + The keys will be imported into your connected hushd node YOUR_TRANSLATION_HERE @@ -590,7 +590,7 @@ - You need to back it up from the machine zcashd is running on + You need to back it up from the machine hushd is running on YOUR_TRANSLATION_HERE @@ -842,7 +842,7 @@ doesn't look like a z-address - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. @@ -929,43 +929,43 @@ doesn't look like a z-address - Starting embedded zcashd + Starting embedded hushd YOUR_TRANSLATION_HERE - zcashd is set to run as daemon + hushd is set to run as daemon YOUR_TRANSLATION_HERE - Waiting for zcashd + Waiting for hushd YOUR_TRANSLATION_HERE - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 YOUR_TRANSLATION_HERE - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. +If all else fails, please run hushd manually. YOUR_TRANSLATION_HERE - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed +Not starting embedded hushd because --no-embedded was passed YOUR_TRANSLATION_HERE @@ -1046,17 +1046,17 @@ Not starting embedded zcashd because --no-embedded was passed - Connected to zcashd + Connected to hushd YOUR_TRANSLATION_HERE - zcashd has no peer connections + hushd has no peer connections - There was an error connecting to zcashd. The error was + There was an error connecting to hushd. The error was YOUR_TRANSLATION_HERE @@ -1123,7 +1123,7 @@ Would you like to visit the releases page? - Waiting for zcashd to exit + Waiting for hushd to exit YOUR_TRANSLATION_HERE @@ -1133,7 +1133,7 @@ Would you like to visit the releases page? - zcashd error + hushd error YOUR_TRANSLATION_HERE @@ -1145,19 +1145,19 @@ Please set the host/port and user/password in the Edit->Settings menu. - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. YOUR_TRANSLATION_HERE - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu YOUR_TRANSLATION_HERE - Your zcashd is starting up. Please wait. + Your hushd is starting up. Please wait. YOUR_TRANSLATION_HERE @@ -1211,12 +1211,12 @@ Please set the host/port and user/password in the Edit->Settings menu.YOUR_TRANSLATION_HERE - doesn't seem to be a valid Zcash address. + doesn't seem to be a valid hush address. YOUR_TRANSLATION_HERE - %1 doesn't seem to be a valid Zcash address. + %1 doesn't seem to be a valid hush address. @@ -1604,17 +1604,17 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y @@ -1647,7 +1647,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - zcashd connection + hushd connection YOUR_TRANSLATION_HERE @@ -1970,7 +1970,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. @@ -1985,64 +1985,64 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createhushConf - - Configure zcash.conf + + Configure hush.conf - + Show Advanced Configuration - - Your zcash node will be configured for you automatically + + Your hush node will be configured for you automatically - + Enable Fast Sync - + Allow connections to the internet to check for updates, get hush/USD prices etc... - + Use custom datadir - + Connect to the internet for updates and price feeds - + Please choose a directory to store your wallet.dat and blockchain - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> - + Choose directory - + Connect over Tor - + Please note that you'll need to already have a Tor service configured on port 9050 @@ -2129,7 +2129,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> YOUR_TRANSLATION_HERE diff --git a/res/zec_qt_wallet_es.ts b/res/zec_qt_wallet_es.ts index 36abf6f..103d552 100644 --- a/res/zec_qt_wallet_es.ts +++ b/res/zec_qt_wallet_es.ts @@ -262,8 +262,8 @@ - zcashd - zcashd + hushd + hushd @@ -400,7 +400,7 @@ - Pay zcash &URI... + Pay hush &URI... @@ -420,7 +420,7 @@ - Request zcash... + Request hush... @@ -430,17 +430,17 @@ - Tor configuration is available only when running an embedded zcashd. + Tor configuration is available only when running an embedded hushd. - You're using an external zcashd. Please restart zcashd with -rescan + You're using an external hushd. Please restart hushd with -rescan - You're using an external zcashd. Please restart zcashd with -reindex + You're using an external hushd. Please restart hushd with -reindex @@ -515,17 +515,17 @@ - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y - Paste Zcash URI + Paste hush URI @@ -535,7 +535,7 @@ - zcashd is not yet ready. Please wait for the UI to load + hushd is not yet ready. Please wait for the UI to load @@ -565,8 +565,8 @@ - The keys will be imported into your connected zcashd node - Las claves serán importadas en su nodo zcashd conectado + The keys will be imported into your connected hushd node + Las claves serán importadas en su nodo hushd conectado @@ -590,8 +590,8 @@ - You need to back it up from the machine zcashd is running on - Necesitas hacer una copia de seguridad de la computadora en la que se está ejecutando zcashd + You need to back it up from the machine hushd is running on + Necesitas hacer una copia de seguridad de la computadora en la que se está ejecutando hushd @@ -842,7 +842,7 @@ doesn't look like a z-address - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. @@ -955,18 +955,18 @@ doesn't look like a z-address - Connected to zcashd - Conectando a zcashd + Connected to hushd + Conectando a hushd - zcashd has no peer connections + hushd has no peer connections - There was an error connecting to zcashd. The error was - Hubo un error al conectar con zcashd. El error fue + There was an error connecting to hushd. The error was + Hubo un error al conectar con hushd. El error fue @@ -1032,8 +1032,8 @@ Would you like to visit the releases page? - Waiting for zcashd to exit - Esperando que zcashd salga + Waiting for hushd to exit + Esperando que hushd salga @@ -1042,18 +1042,18 @@ Would you like to visit the releases page? - Starting embedded zcashd - Iniciando zcashd incorporado + Starting embedded hushd + Iniciando hushd incorporado - zcashd is set to run as daemon - zcashd está configurado para ejecutarse como demonio + hushd is set to run as daemon + hushd está configurado para ejecutarse como demonio - Waiting for zcashd - Esperando zcashd + Waiting for hushd + Esperando hushd @@ -1112,10 +1112,10 @@ Please set the host/port and user/password in the Edit->Settings menu. - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - No su puede conectar a zcashd usando la configuración actual. + No su puede conectar a hushd usando la configuración actual. Por favor, especificar el host/puerta y usario/contraseña en el menú Editar->Configuración. @@ -1140,28 +1140,28 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - Has configurado zcashd para ejecutar como demonio, lo que puede causar problemas con silentdragon. -Por favor, eliminar la siguente linea de zcashd.conf y reinicia silentdragon + Has configurado hushd para ejecutar como demonio, lo que puede causar problemas con silentdragon. +Por favor, eliminar la siguente linea de hushd.conf y reinicia silentdragon daemon=1 - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. - No se pudo iniciar zcashd incorporado. +If all else fails, please run hushd manually. + No se pudo iniciar hushd incorporado. Por favor, intenta reiniciar. -Si todo falla, por favor ejecutar zcashd manualmente. +Si todo falla, por favor ejecutar hushd manualmente. @@ -1171,27 +1171,27 @@ Si todo falla, por favor ejecutar zcashd manualmente. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed - No se pudo conectar con zcashd configurado en zcashd.conf. +Not starting embedded hushd because --no-embedded was passed + No se pudo conectar con hushd configurado en hushd.conf. -No iniciaré zcashd incorporado porque la opcion --no-embedded fue dada. +No iniciaré hushd incorporado porque la opcion --no-embedded fue dada. - zcashd error - error de zcashd + hushd error + error de hushd - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - Autenticación fallida. El usario/contraseña que epecificó no fue aceptado por zcashd. Intenta cambiarlo en el menu Editar->Configuración. + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + Autenticación fallida. El usario/contraseña que epecificó no fue aceptado por hushd. Intenta cambiarlo en el menu Editar->Configuración. - Your zcashd is starting up. Please wait. - Tu zcashd se está iniciando. Por favor espera. + Your hushd is starting up. Please wait. + Tu hushd se está iniciando. Por favor espera. @@ -1274,12 +1274,12 @@ El saldo es insuficiente para una migración automática. Error en el formato de la dirección. - doesn't seem to be a valid Zcash address. - no parece ser una dirección Zcash válida + doesn't seem to be a valid hush address. + no parece ser una dirección hush válida - %1 doesn't seem to be a valid Zcash address. + %1 doesn't seem to be a valid hush address. @@ -1620,17 +1620,17 @@ El saldo es insuficiente para una migración automática. - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y @@ -1663,8 +1663,8 @@ El saldo es insuficiente para una migración automática. - zcashd connection - conexión zcashd + hushd connection + conexión hushd @@ -1986,7 +1986,7 @@ El saldo es insuficiente para una migración automática. - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. @@ -2001,64 +2001,64 @@ El saldo es insuficiente para una migración automática. - createZcashConf + createhushConf - - Configure zcash.conf + + Configure hush.conf - + Show Advanced Configuration - - Your zcash node will be configured for you automatically + + Your hush node will be configured for you automatically - + Enable Fast Sync - + Allow connections to the internet to check for updates, get hush/USD prices etc... - + Use custom datadir - + Connect to the internet for updates and price feeds - + Please choose a directory to store your wallet.dat and blockchain - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> - + Choose directory - + Connect over Tor - + Please note that you'll need to already have a Tor service configured on port 9050 @@ -2145,8 +2145,8 @@ El saldo es insuficiente para una migración automática. - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard: Mensajes de chat totalmente anónimos e imposibles de rastrear basados en la cadena de bloques Zcash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Mensajes de chat totalmente anónimos e imposibles de rastrear basados en la cadena de bloques hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/res/zec_qt_wallet_fr.ts b/res/zec_qt_wallet_fr.ts index 5fbea9a..eec9729 100644 --- a/res/zec_qt_wallet_fr.ts +++ b/res/zec_qt_wallet_fr.ts @@ -267,8 +267,8 @@ - zcashd - zcashd + hushd + hushd @@ -405,8 +405,8 @@ - Pay zcash &URI... - PAyer une URI zcash + Pay hush &URI... + PAyer une URI hush @@ -425,7 +425,7 @@ - Request zcash... + Request hush... @@ -435,17 +435,17 @@ - Tor configuration is available only when running an embedded zcashd. - La configuration de Tor est disponible uniquement lors de l'exécution du processus zcashd intégré. + Tor configuration is available only when running an embedded hushd. + La configuration de Tor est disponible uniquement lors de l'exécution du processus hushd intégré. - You're using an external zcashd. Please restart zcashd with -rescan + You're using an external hushd. Please restart hushd with -rescan - You're using an external zcashd. Please restart zcashd with -reindex + You're using an external hushd. Please restart hushd with -reindex @@ -525,7 +525,7 @@ - zcashd is not yet ready. Please wait for the UI to load + hushd is not yet ready. Please wait for the UI to load @@ -550,18 +550,18 @@ - Error paying zcash URI - Erreur lors du payement du URI zcash + Error paying hush URI + Erreur lors du payement du URI hush - URI should be of the form 'zcash:<addr>?amt=x&memo=y - Le format URI doit être comme suit: 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y + Le format URI doit être comme suit: 'hush:<addr>?amt=x&memo=y - Paste Zcash URI - Coller le URI Zcash + Paste hush URI + Coller le URI hush Could not understand address @@ -578,8 +578,8 @@ - The keys will be imported into your connected zcashd node - Les clef seront importées dans votre noeud zcashd connecté + The keys will be imported into your connected hushd node + Les clef seront importées dans votre noeud hushd connecté @@ -603,8 +603,8 @@ - You need to back it up from the machine zcashd is running on - Vous devez effectuer la sauvegarde depuis la machine sur laquelle zcashd est en cours d'exécution + You need to back it up from the machine hushd is running on + Vous devez effectuer la sauvegarde depuis la machine sur laquelle hushd est en cours d'exécution @@ -865,7 +865,7 @@ Cette adresse ne semble pas être de type adresse-z - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. @@ -952,53 +952,53 @@ Cette adresse ne semble pas être de type adresse-z - Starting embedded zcashd - Démarrage de zcashd intégré + Starting embedded hushd + Démarrage de hushd intégré - zcashd is set to run as daemon - zcashd est configuré pour s'exécuter en tant que démon + hushd is set to run as daemon + hushd est configuré pour s'exécuter en tant que démon - Waiting for zcashd - En attente de zcashd + Waiting for hushd + En attente de hushd - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - vous avez zcashd configuré pour démarrer en tant que démon ce qui peut causer des problèmes avec silentdragon + vous avez hushd configuré pour démarrer en tant que démon ce qui peut causer des problèmes avec silentdragon - Veuillez enlever la ligne suivante de votre fichier "zcash.conf" et redémarrer silentdragon: + Veuillez enlever la ligne suivante de votre fichier "hush.conf" et redémarrer silentdragon: daemon=1 - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. - Impossible de démarrer le zcashd intégré. +If all else fails, please run hushd manually. + Impossible de démarrer le hushd intégré. Veuillez essayer de redémarrer. -Si vous avez précédemment démarré zcashd avec des arguments, vous devrez peut-être réinitialiser le fichier zcash.conf. +Si vous avez précédemment démarré hushd avec des arguments, vous devrez peut-être réinitialiser le fichier hush.conf. -Si tout échoue, exécutez zcashd manuellement. +Si tout échoue, exécutez hushd manuellement. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed - Le démarrage de zcashd n'a pas eu lieu car l'argument --no-embedded a été utilisé au lancement +Not starting embedded hushd because --no-embedded was passed + Le démarrage de hushd n'a pas eu lieu car l'argument --no-embedded a été utilisé au lancement @@ -1078,18 +1078,18 @@ Not starting embedded zcashd because --no-embedded was passed - Connected to zcashd - Connecté à zcashd + Connected to hushd + Connecté à hushd - zcashd has no peer connections - zcashd n'a aucune connexion à un pair + hushd has no peer connections + hushd n'a aucune connexion à un pair - There was an error connecting to zcashd. The error was - Une erreur est survenue lors de la connection à zcashd. L'erreur est + There was an error connecting to hushd. The error was + Une erreur est survenue lors de la connection à hushd. L'erreur est @@ -1155,8 +1155,8 @@ Would you like to visit the releases page? - Waiting for zcashd to exit - Attente de la fermeture de zcashd + Waiting for hushd to exit + Attente de la fermeture de hushd @@ -1165,8 +1165,8 @@ Would you like to visit the releases page? - zcashd error - erreur zcashd + hushd error + erreur hushd @@ -1179,22 +1179,22 @@ Veuillez configurer l'hôte/port et utilisateur/mot de passe dans le menu E - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - Impossible de se connecter au zcashd configuré dans les préférences. + Impossible de se connecter au hushd configuré dans les préférences. Veuillez configurer l'hôte/port et utilisateur/mot de passe dans le menu Edition->Préférences. - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - Authentification échouée. Le nom d'utilisateur / mot de passe que vous avez spécifié n'a pas été accepté par zcashd. Essayez de le changer dans le menu Edition-> Préférences + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + Authentification échouée. Le nom d'utilisateur / mot de passe que vous avez spécifié n'a pas été accepté par hushd. Essayez de le changer dans le menu Edition-> Préférences - Your zcashd is starting up. Please wait. - Votre zcashd est en cours de démarrage. Veuillez patienter. + Your hushd is starting up. Please wait. + Votre hushd est en cours de démarrage. Veuillez patienter. @@ -1247,12 +1247,12 @@ Veuillez configurer l'hôte/port et utilisateur/mot de passe dans le menu E Erreur de format d'adresse - doesn't seem to be a valid Zcash address. - ne semble pas être une adresse Zcash valide. + doesn't seem to be a valid hush address. + ne semble pas être une adresse hush valide. - %1 doesn't seem to be a valid Zcash address. + %1 doesn't seem to be a valid hush address. @@ -1641,18 +1641,18 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. - Error paying zcash URI - Erreur lors du payement du URI zcash + Error paying hush URI + Erreur lors du payement du URI hush - URI should be of the form 'zcash:<addr>?amt=x&memo=y - Le format URI doit être comme suit: 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y + Le format URI doit être comme suit: 'hush:<addr>?amt=x&memo=y @@ -1684,8 +1684,8 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - zcashd connection - connection zcashd + hushd connection + connection hushd @@ -2007,12 +2007,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this Transaction might not work. - zcashd semble n'avoir aucune connexion à un autre pair. Comme vous n'êtes peut-être pas connecté à Internet, cette transaction pourrait ne pas fonctionner. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this Transaction might not work. + hushd semble n'avoir aucune connexion à un autre pair. Comme vous n'êtes peut-être pas connecté à Internet, cette transaction pourrait ne pas fonctionner. @@ -2026,64 +2026,64 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - createZcashConf + createhushConf - - Configure zcash.conf + + Configure hush.conf - + Show Advanced Configuration - - Your zcash node will be configured for you automatically + + Your hush node will be configured for you automatically - + Enable Fast Sync - + Allow connections to the internet to check for updates, get hush/USD prices etc... - + Use custom datadir - + Connect to the internet for updates and price feeds - + Please choose a directory to store your wallet.dat and blockchain - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> - + Choose directory - + Connect over Tor - + Please note that you'll need to already have a Tor service configured on port 9050 @@ -2170,8 +2170,8 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>Zboard: Messagerie entièrement anonyme et intraçable basée sur la blockchain ZCash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>Zboard: Messagerie entièrement anonyme et intraçable basée sur la blockchain hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/res/zec_qt_wallet_it.ts b/res/zec_qt_wallet_it.ts index 0f08bf0..5d0d6d5 100644 --- a/res/zec_qt_wallet_it.ts +++ b/res/zec_qt_wallet_it.ts @@ -261,8 +261,8 @@ - zcashd - zcashd + hushd + hushd @@ -407,7 +407,7 @@ - Pay zcash &URI... + Pay hush &URI... @@ -427,7 +427,7 @@ - Request zcash... + Request hush... @@ -477,17 +477,17 @@ - Tor configuration is available only when running an embedded zcashd. + Tor configuration is available only when running an embedded hushd. - You're using an external zcashd. Please restart zcashd with -rescan + You're using an external hushd. Please restart hushd with -rescan - You're using an external zcashd. Please restart zcashd with -reindex + You're using an external hushd. Please restart hushd with -reindex @@ -522,17 +522,17 @@ - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y - Paste Zcash URI + Paste hush URI @@ -542,7 +542,7 @@ - zcashd is not yet ready. Please wait for the UI to load + hushd is not yet ready. Please wait for the UI to load @@ -572,9 +572,9 @@ - The keys will be imported into your connected zcashd node + The keys will be imported into your connected hushd node check - Le chiavi saranno importate nel tuo nodo zcashd + Le chiavi saranno importate nel tuo nodo hushd @@ -598,8 +598,8 @@ - You need to back it up from the machine zcashd is running on - È necessario eseguire il backup dalla macchina su cui zcashd è in esecuzione + You need to back it up from the machine hushd is running on + È necessario eseguire il backup dalla macchina su cui hushd è in esecuzione @@ -852,7 +852,7 @@ doesn't look like a z-address - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. @@ -939,52 +939,52 @@ doesn't look like a z-address - Starting embedded zcashd + Starting embedded hushd check - Avvio demone zcashd + Avvio demone hushd - zcashd is set to run as daemon - zcashd è impostato per essere eseguito come un demone + hushd is set to run as daemon + hushd è impostato per essere eseguito come un demone - Waiting for zcashd - In attesa di zcashd + Waiting for hushd + In attesa di hushd - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - Hai zcashd impostato per l'avvio come daemon, che può causare problemi con silentdragon + Hai hushd impostato per l'avvio come daemon, che può causare problemi con silentdragon YOUR_TRANSLATION_HERE - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. +If all else fails, please run hushd manually. check - Impossibile avviare zcashd integrato + Impossibile avviare hushd integrato Per favore prova a riavviare. -Se hai precedentemente avviato zcashd con parametri personalizzati, potresti dover reimpostare lo zcash.conf -Se tutto il resto fallisce, si prega di eseguire manualmente zcashd. +Se hai precedentemente avviato hushd con parametri personalizzati, potresti dover reimpostare lo hush.conf +Se tutto il resto fallisce, si prega di eseguire manualmente hushd. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed +Not starting embedded hushd because --no-embedded was passed Check - Impossibile connettersi a zcashd come configurato nello zcash.conf. -Non è stato avviato zcashd integrato perché è stato passato il comando --no-embedded + Impossibile connettersi a hushd come configurato nello hush.conf. +Non è stato avviato hushd integrato perché è stato passato il comando --no-embedded @@ -1065,18 +1065,18 @@ Non è stato avviato zcashd integrato perché è stato passato il comando --no-e - Connected to zcashd - Connesso a zcashd + Connected to hushd + Connesso a hushd - zcashd has no peer connections + hushd has no peer connections - There was an error connecting to zcashd. The error was - Si è verificato un errore durante la connessione a zcashd. L'errore era + There was an error connecting to hushd. The error was + Si è verificato un errore durante la connessione a hushd. L'errore era @@ -1143,9 +1143,9 @@ Would you like to visit the releases page? - Waiting for zcashd to exit + Waiting for hushd to exit vedi appunto precedente - Attendere l'uscita di zcashd + Attendere l'uscita di hushd @@ -1154,8 +1154,8 @@ Would you like to visit the releases page? - zcashd error - zcashd errore + hushd error + hushd errore @@ -1167,22 +1167,22 @@ Impostare host/porta e utente/password nel menu Modifica-> Impostazioni. - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - Impossibile connettersi a zcashd configurato nelle impostazioni. + Impossibile connettersi a hushd configurato nelle impostazioni. Impostare host/porta e utente/password nel menu Modifica-> Impostazioni. - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - Autenticazione fallita. Il nome utente/password che hai specificato non sono stati accettati da zcashd. Prova a cambiarlo nel menu Modifica-> Impostazioni + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + Autenticazione fallita. Il nome utente/password che hai specificato non sono stati accettati da hushd. Prova a cambiarlo nel menu Modifica-> Impostazioni - Your zcashd is starting up. Please wait. - Il tuo zcashd si sta avviando. Attendere prego. + Your hushd is starting up. Please wait. + Il tuo hushd si sta avviando. Attendere prego. @@ -1235,12 +1235,12 @@ Impostare host/porta e utente/password nel menu Modifica-> Impostazioni.Errore nel formato dell'indirizzo - doesn't seem to be a valid Zcash address. - Non sembra un indirizzo Zcash Valido. + doesn't seem to be a valid hush address. + Non sembra un indirizzo hush Valido. - %1 doesn't seem to be a valid Zcash address. + %1 doesn't seem to be a valid hush address. @@ -1629,17 +1629,17 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y @@ -1672,8 +1672,8 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - zcashd connection - Connessione zcashd + hushd connection + Connessione hushd @@ -1997,7 +1997,7 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. @@ -2012,64 +2012,64 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - createZcashConf + createhushConf - - Configure zcash.conf + + Configure hush.conf - + Show Advanced Configuration - - Your zcash node will be configured for you automatically + + Your hush node will be configured for you automatically - + Enable Fast Sync - + Allow connections to the internet to check for updates, get hush/USD prices etc... - + Use custom datadir - + Connect to the internet for updates and price feeds - + Please choose a directory to store your wallet.dat and blockchain - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> - + Choose directory - + Connect over Tor - + Please note that you'll need to already have a Tor service configured on port 9050 @@ -2156,9 +2156,9 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> Check, no idea - <html><head/><body><p>ZBoard: messaggi di chat completamente anonimi e non tracciabili basati sulla blockchain di ZCash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: messaggi di chat completamente anonimi e non tracciabili basati sulla blockchain di hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/res/zec_qt_wallet_pt.ts b/res/zec_qt_wallet_pt.ts index 6ec0c5f..966dd3e 100644 --- a/res/zec_qt_wallet_pt.ts +++ b/res/zec_qt_wallet_pt.ts @@ -262,8 +262,8 @@ - zcashd - zcashd + hushd + hushd @@ -400,7 +400,7 @@ - Pay zcash &URI... + Pay hush &URI... @@ -420,7 +420,7 @@ - Request zcash... + Request hush... @@ -430,17 +430,17 @@ - Tor configuration is available only when running an embedded zcashd. + Tor configuration is available only when running an embedded hushd. - You're using an external zcashd. Please restart zcashd with -rescan + You're using an external hushd. Please restart hushd with -rescan - You're using an external zcashd. Please restart zcashd with -reindex + You're using an external hushd. Please restart hushd with -reindex @@ -515,17 +515,17 @@ - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y - Paste Zcash URI + Paste hush URI @@ -535,7 +535,7 @@ - zcashd is not yet ready. Please wait for the UI to load + hushd is not yet ready. Please wait for the UI to load @@ -565,8 +565,8 @@ - The keys will be imported into your connected zcashd node - As chaves serão importadas em seu nó zcashd conectado + The keys will be imported into your connected hushd node + As chaves serão importadas em seu nó hushd conectado @@ -590,8 +590,8 @@ - You need to back it up from the machine zcashd is running on - Você precisar salvar a partir da máquina que zcashd está rodando + You need to back it up from the machine hushd is running on + Você precisar salvar a partir da máquina que hushd está rodando @@ -844,7 +844,7 @@ não se parece com um z-Address - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. @@ -931,52 +931,52 @@ não se parece com um z-Address - Starting embedded zcashd - Iniciando zcashd acoplado + Starting embedded hushd + Iniciando hushd acoplado - zcashd is set to run as daemon - erro no zcashd + hushd is set to run as daemon + erro no hushd - Waiting for zcashd - Esperando pelo zcashd + Waiting for hushd + Esperando pelo hushd - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - Você tem zcashd configurado como daemon, o que pode causar problemas com a silentdragon - Por favor, remova a seguinte linha do seu zcash.conf e reinicie a silentdragon: + Você tem hushd configurado como daemon, o que pode causar problemas com a silentdragon + Por favor, remova a seguinte linha do seu hush.conf e reinicie a silentdragon: daemon=1 - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. - Não foi possível iniciar o zcashd acoplado. +If all else fails, please run hushd manually. + Não foi possível iniciar o hushd acoplado. Por favor, tenta reiniciar. -Se você iniciou zcashd anteriormente com parâmetros customizados você pode precisar resetar seu zcash.conf. +Se você iniciou hushd anteriormente com parâmetros customizados você pode precisar resetar seu hush.conf. -Se ainda assim não der certo, por favor rode zcashd manualmente. +Se ainda assim não der certo, por favor rode hushd manualmente. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed - Não foi possível conectar ao zcashd configurado em zcash.conf. +Not starting embedded hushd because --no-embedded was passed + Não foi possível conectar ao hushd configurado em hush.conf. -Não iniciando zcashd acoplado porque nenhum foi passado como parâmetro +Não iniciando hushd acoplado porque nenhum foi passado como parâmetro @@ -1056,18 +1056,18 @@ Não iniciando zcashd acoplado porque nenhum foi passado como parâmetro - Connected to zcashd - Conectado ao zcashd + Connected to hushd + Conectado ao hushd - zcashd has no peer connections + hushd has no peer connections - There was an error connecting to zcashd. The error was - Ocorreu um erro conectando ao zcashd. O erro foi + There was an error connecting to hushd. The error was + Ocorreu um erro conectando ao hushd. O erro foi @@ -1133,8 +1133,8 @@ Would you like to visit the releases page? - Waiting for zcashd to exit - Esperando zcashd finalizar + Waiting for hushd to exit + Esperando hushd finalizar @@ -1143,8 +1143,8 @@ Would you like to visit the releases page? - zcashd error - erro no zcashd + hushd error + erro no hushd @@ -1157,22 +1157,22 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar>Preferências - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - Não foi possível conectar ao zcashd configurado nas preferências. + Não foi possível conectar ao hushd configurado nas preferências. Por favor, coloque o host/porta e usuário/senha no menu Editar>Preferências. - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - Autenticação falhou. O usuário/senha especificado não foi aceitado pelo zcashd. Tente alterá-los em Editar->Preferências + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + Autenticação falhou. O usuário/senha especificado não foi aceitado pelo hushd. Tente alterá-los em Editar->Preferências - Your zcashd is starting up. Please wait. - Seu zcashd está iniciando. Por favor aguarde. + Your hushd is starting up. Please wait. + Seu hushd está iniciando. Por favor aguarde. @@ -1225,12 +1225,12 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar>Preferências Erro no Formato do Endereço - doesn't seem to be a valid Zcash address. - não aparenter ser um endereço válido de Zcash. + doesn't seem to be a valid hush address. + não aparenter ser um endereço válido de hush. - %1 doesn't seem to be a valid Zcash address. + %1 doesn't seem to be a valid hush address. @@ -1619,17 +1619,17 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. - Error paying zcash URI + Error paying hush URI - URI should be of the form 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y @@ -1662,8 +1662,8 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - zcashd connection - Conexão com zcashd + hushd connection + Conexão com hushd @@ -1985,7 +1985,7 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. @@ -2000,64 +2000,64 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - createZcashConf + createhushConf - - Configure zcash.conf + + Configure hush.conf - + Show Advanced Configuration - - Your zcash node will be configured for you automatically + + Your hush node will be configured for you automatically - + Enable Fast Sync - + Allow connections to the internet to check for updates, get hush/USD prices etc... - + Use custom datadir - + Connect to the internet for updates and price feeds - + Please choose a directory to store your wallet.dat and blockchain - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> - + Choose directory - + Connect over Tor - + Please note that you'll need to already have a Tor service configured on port 9050 @@ -2144,8 +2144,8 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard: Chat de mensagens totalmente anônimas e irrastreáveis usando a blockchain da Zcash. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Chat de mensagens totalmente anônimas e irrastreáveis usando a blockchain da hush. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/res/zec_qt_wallet_template.ts b/res/zec_qt_wallet_template.ts index 758f8d5..1bb0e93 100644 --- a/res/zec_qt_wallet_template.ts +++ b/res/zec_qt_wallet_template.ts @@ -210,7 +210,7 @@ - zcashd + hushd YOUR_TRANSLATION_HERE @@ -391,7 +391,7 @@ - The keys will be imported into your connected zcashd node + The keys will be imported into your connected hushd node YOUR_TRANSLATION_HERE @@ -406,7 +406,7 @@ - You need to back it up from the machine zcashd is running on + You need to back it up from the machine hushd is running on YOUR_TRANSLATION_HERE @@ -577,43 +577,43 @@ doesn't look like a z-address - Starting embedded zcashd + Starting embedded hushd YOUR_TRANSLATION_HERE - zcashd is set to run as daemon + hushd is set to run as daemon YOUR_TRANSLATION_HERE - Waiting for zcashd + Waiting for hushd YOUR_TRANSLATION_HERE - You have zcashd set to start as a daemon, which can cause problems with hush-qt-wallet + You have hushd set to start as a daemon, which can cause problems with hush-qt-wallet -.Please remove the following line from your zcash.conf and restart hush-qt-wallet +.Please remove the following line from your hush.conf and restart hush-qt-wallet daemon=1 YOUR_TRANSLATION_HERE - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. +If all else fails, please run hushd manually. YOUR_TRANSLATION_HERE - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed +Not starting embedded hushd because --no-embedded was passed YOUR_TRANSLATION_HERE @@ -679,12 +679,12 @@ Not starting embedded zcashd because --no-embedded was passed - Connected to zcashd + Connected to hushd YOUR_TRANSLATION_HERE - There was an error connecting to zcashd. The error was + There was an error connecting to hushd. The error was YOUR_TRANSLATION_HERE @@ -719,7 +719,7 @@ Not starting embedded zcashd because --no-embedded was passed - Waiting for zcashd to exit + Waiting for hushd to exit YOUR_TRANSLATION_HERE @@ -729,7 +729,7 @@ Not starting embedded zcashd because --no-embedded was passed - zcashd error + hushd error YOUR_TRANSLATION_HERE @@ -741,19 +741,19 @@ Please set the host/port and user/password in the Edit->Settings menu. - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. YOUR_TRANSLATION_HERE - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu YOUR_TRANSLATION_HERE - Your zcashd is starting up. Please wait. + Your hushd is starting up. Please wait. YOUR_TRANSLATION_HERE @@ -786,7 +786,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - doesn't seem to be a valid Zcash address. + doesn't seem to be a valid hush address. YOUR_TRANSLATION_HERE @@ -855,7 +855,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - zcashd connection + hushd connection YOUR_TRANSLATION_HERE @@ -1094,7 +1094,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> YOUR_TRANSLATION_HERE diff --git a/res/zec_qt_wallet_tr.ts b/res/zec_qt_wallet_tr.ts index 5cfdd79..fd1261e 100644 --- a/res/zec_qt_wallet_tr.ts +++ b/res/zec_qt_wallet_tr.ts @@ -265,8 +265,8 @@ - zcashd - zcashd + hushd + hushd @@ -380,8 +380,8 @@ - Pay zcash &URI... - zcash URI öde... + Pay hush &URI... + hush URI öde... @@ -400,8 +400,8 @@ - Request zcash... - zcash iste... + Request hush... + hush iste... @@ -482,8 +482,8 @@ - zcashd is not yet ready. Please wait for the UI to load - zcashd henüz hazır değil. Lütfen arayüzün yüklenmesini bekleyin + hushd is not yet ready. Please wait for the UI to load + hushd henüz hazır değil. Lütfen arayüzün yüklenmesini bekleyin @@ -497,18 +497,18 @@ - Tor configuration is available only when running an embedded zcashd. - Tor konfigürasyonu yalnızca gömülü bir zcashd çalışırken kullanılabilir. + Tor configuration is available only when running an embedded hushd. + Tor konfigürasyonu yalnızca gömülü bir hushd çalışırken kullanılabilir. - You're using an external zcashd. Please restart zcashd with -rescan - Harici bir zcashd kullanıyorsun. Lütfen zcashd'yi -rescan ile yeniden başlat + You're using an external hushd. Please restart hushd with -rescan + Harici bir hushd kullanıyorsun. Lütfen hushd'yi -rescan ile yeniden başlat - You're using an external zcashd. Please restart zcashd with -reindex - Harici bir zcashd kullanıyorsun. Lütfen zcashd'yi -reindex ile yeniden başlat + You're using an external hushd. Please restart hushd with -reindex + Harici bir hushd kullanıyorsun. Lütfen hushd'yi -reindex ile yeniden başlat @@ -562,18 +562,18 @@ - Paste Zcash URI - Zcash URI Yapıştır + Paste hush URI + hush URI Yapıştır - Error paying zcash URI - zcash URI ödeme hatası + Error paying hush URI + hush URI ödeme hatası - URI should be of the form 'zcash:<addr>?amt=x&memo=y - URI bu şekilde olmalıdır: 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y + URI bu şekilde olmalıdır: 'hush:<addr>?amt=x&memo=y @@ -582,8 +582,8 @@ - The keys will be imported into your connected zcashd node - Anahtarlar bağlı zcashd düğümünüze aktarılacak + The keys will be imported into your connected hushd node + Anahtarlar bağlı hushd düğümünüze aktarılacak YOUR_TRANSLATION_HERE @@ -608,8 +608,8 @@ - You need to back it up from the machine zcashd is running on - zcashd'nin çalıştığı makineden yedeklemeniz gerekiyor + You need to back it up from the machine hushd is running on + hushd'nin çalıştığı makineden yedeklemeniz gerekiyor @@ -862,8 +862,8 @@ z-adres'i gibi görünmüyor - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. - Etkinleştirilirse, zcashd Sprout korumalı fonlarınızı yavaşça Sapling adresinize taşıyacaktır. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. + Etkinleştirilirse, hushd Sprout korumalı fonlarınızı yavaşça Sapling adresinize taşıyacaktır. @@ -949,54 +949,54 @@ z-adres'i gibi görünmüyor - Starting embedded zcashd - Gömülü zcashd başlatılıyor + Starting embedded hushd + Gömülü hushd başlatılıyor - zcashd is set to run as daemon - zcashd daemon olarak çalışacak şekilde ayarlandı + hushd is set to run as daemon + hushd daemon olarak çalışacak şekilde ayarlandı - Waiting for zcashd - zcashd bekleniyor + Waiting for hushd + hushd bekleniyor - You have zcashd set to start as a daemon, which can cause problems with hush-qt-wallet + You have hushd set to start as a daemon, which can cause problems with hush-qt-wallet -.Please remove the following line from your zcash.conf and restart hush-qt-wallet +.Please remove the following line from your hush.conf and restart hush-qt-wallet daemon=1 - zcashd, hush-qt-wallet ile sorunlara neden olan bir daemon olarak başlayacak şekilde ayarladınız. + hushd, hush-qt-wallet ile sorunlara neden olan bir daemon olarak başlayacak şekilde ayarladınız. -.Lütfen aşağıdaki satırı zcash.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın +.Lütfen aşağıdaki satırı hush.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın daemon=1 - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. - Gömülü zcashd başlatılamadı. +If all else fails, please run hushd manually. + Gömülü hushd başlatılamadı. Lütfen yeniden başlatmayı deneyin. -Daha önce zcashd'yi özel argümanlarla başlattıysanız, zcash.conf dosyasını sıfırlamanız gerekebilir. +Daha önce hushd'yi özel argümanlarla başlattıysanız, hush.conf dosyasını sıfırlamanız gerekebilir. -Hepsi başarısız olursa, lütfen zcashd'yi manuel olarak çalıştırın. +Hepsi başarısız olursa, lütfen hushd'yi manuel olarak çalıştırın. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed - zcash.conf ile yapılandırılmış zcashd'ye bağlanılamadı. +Not starting embedded hushd because --no-embedded was passed + hush.conf ile yapılandırılmış hushd'ye bağlanılamadı. ---no-embedded iletildiğinden gömülü zcashd başlatılmıyor +--no-embedded iletildiğinden gömülü hushd başlatılmıyor @@ -1015,13 +1015,13 @@ Not starting embedded zcashd because --no-embedded was passed - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - zcashd'yi, hush-qt-wallet ile sorunlara neden olabilecek bir daemon olacak şekilde ayarladınız. + hushd'yi, hush-qt-wallet ile sorunlara neden olabilecek bir daemon olacak şekilde ayarladınız. -.Lütfen aşağıdaki satırı zcash.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın +.Lütfen aşağıdaki satırı hush.conf dosyanızdan kaldırın ve silentdragon'i yeniden başlatın daemon=1 @@ -1087,18 +1087,18 @@ daemon=1 - Connected to zcashd - Zcashd'ye bağlanıldı + Connected to hushd + hushd'ye bağlanıldı - zcashd has no peer connections - zcashd'nin eş bağlantısı yok + hushd has no peer connections + hushd'nin eş bağlantısı yok - There was an error connecting to zcashd. The error was - zcashd ile bağlantı kurulurken bir hata oluştu. Hata + There was an error connecting to hushd. The error was + hushd ile bağlantı kurulurken bir hata oluştu. Hata @@ -1207,8 +1207,8 @@ Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? - Waiting for zcashd to exit - Çıkmak için zcashd bekleniyor + Waiting for hushd to exit + Çıkmak için hushd bekleniyor @@ -1217,8 +1217,8 @@ Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? - zcashd error - zcashd hatası + hushd error + hushd hatası @@ -1231,22 +1231,22 @@ Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktasını ve kullan - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - Ayarlarda yapılandırılmış zcashd'ye bağlanılamadı. + Ayarlarda yapılandırılmış hushd'ye bağlanılamadı. Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıcı adı/şifreyi ayarlayın. - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - Kimlik doğrulama başarısız oldu. Belirttiğiniz kullanıcı adı/şifre zcashd tarafından kabul edilmedi. Düzenle-> Ayarlar menüsünde değiştirmeyi deneyin + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + Kimlik doğrulama başarısız oldu. Belirttiğiniz kullanıcı adı/şifre hushd tarafından kabul edilmedi. Düzenle-> Ayarlar menüsünde değiştirmeyi deneyin - Your zcashd is starting up. Please wait. - Zcashd'niz başlıyor. Lütfen bekle. + Your hushd is starting up. Please wait. + hushd'niz başlıyor. Lütfen bekle. @@ -1284,8 +1284,8 @@ Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc Adres Formatı Hatası - doesn't seem to be a valid Zcash address. - geçerli bir Zcash adresi gibi görünmüyor. + doesn't seem to be a valid hush address. + geçerli bir hush adresi gibi görünmüyor. @@ -1304,8 +1304,8 @@ Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc - %1 doesn't seem to be a valid Zcash address. - %1 geçerli bir Zcash adresi gibi gözükmüyor. + %1 doesn't seem to be a valid hush address. + %1 geçerli bir hush adresi gibi gözükmüyor. @@ -1656,18 +1656,18 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. - Bir Sapling adresinden ödeme talep edin. Bir zcash ödeme URI'si olan bir adrese hush 0.0001 işlemi gönderirsiniz. Adres size ödeme yaptığında Memo işleme dahil edilecektir. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. + Bir Sapling adresinden ödeme talep edin. Bir hush ödeme URI'si olan bir adrese hush 0.0001 işlemi gönderirsiniz. Adres size ödeme yaptığında Memo işleme dahil edilecektir. - Error paying zcash URI - zcash URI ödeme hatası + Error paying hush URI + hush URI ödeme hatası - URI should be of the form 'zcash:<addr>?amt=x&memo=y - URI bu şekilde olmalıdır: 'zcash:<addr>?amt=x&memo=y + URI should be of the form 'hush:<addr>?amt=x&memo=y + URI bu şekilde olmalıdır: 'hush:<addr>?amt=x&memo=y @@ -1699,8 +1699,8 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - zcashd connection - zcashd bağlantısı + hushd connection + hushd bağlantısı @@ -2022,8 +2022,8 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. - zcashd'in düğümleri yok gibi görünüyor. İnternete bağlı olmadığınız için bu işlem çalışmayabilir. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd'in düğümleri yok gibi görünüyor. İnternete bağlı olmadığınız için bu işlem çalışmayabilir. @@ -2037,64 +2037,64 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - createZcashConf + createhushConf - - Configure zcash.conf - zcash.conf dosyasını yapılandırma + + Configure hush.conf + hush.conf dosyasını yapılandırma - - Your zcash node will be configured for you automatically - zcash düğümünüz sizin için otomatik olarak yapılandırılacak + + Your hush node will be configured for you automatically + hush düğümünüz sizin için otomatik olarak yapılandırılacak - + Enable Fast Sync Hızlı Senkronizasyonu Etkinleştir - + Show Advanced Configuration Gelişmiş Yapılandırmayı Göster - + Allow connections to the internet to check for updates, get hush/USD prices etc... hush/USD fiyatlarını çekme, güncellemeleri denetleme vb. işlemler için internete bağlanmaya izin ver - + Use custom datadir Özel datadir (veri dizini) kullan - + Choose directory Dizin seç - + Please note that you'll need to already have a Tor service configured on port 9050 Lütfen 9050 numaralı bağlantı noktasında yapılandırılmış bir Tor servisine ihtiyacınız olduğunu unutmayın - + Connect to the internet for updates and price feeds Güncellemelere ve fiyatlara bakmak için internete bağlan - + Please choose a directory to store your wallet.dat and blockchain Lütfen wallet.dat ve blok zinciri'nizi saklamak için bir dizin seçin - + Connect over Tor Tor üzerinden bağlan - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> <html><head/><body><p>Blok indirme işlemi sırasında en uzun süren kontrolleri atlar. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Daha fazla bilgi edin</span></a></p></body></html> @@ -2181,8 +2181,8 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard: ZCash blockchain'i üzerinde tamamen anonim ve takip edilemeyen sohbet mesajları. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: hush blockchain'i üzerinde tamamen anonim ve takip edilemeyen sohbet mesajları. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/res/zec_qt_wallet_zh.ts b/res/zec_qt_wallet_zh.ts index ca4dde9..05c57bb 100644 --- a/res/zec_qt_wallet_zh.ts +++ b/res/zec_qt_wallet_zh.ts @@ -249,7 +249,7 @@ - zcashd + hushd 节点 @@ -392,8 +392,8 @@ - Pay zcash &URI... - 支付zcash &URI ... + Pay hush &URI... + 支付hush &URI ... @@ -412,8 +412,8 @@ - Request zcash... - 请求 zcash... + Request hush... + 请求 hush... @@ -427,8 +427,8 @@ - zcashd is not yet ready. Please wait for the UI to load - zcashd尚未准备好。 请等待UI加载 + hushd is not yet ready. Please wait for the UI to load + hushd尚未准备好。 请等待UI加载 @@ -442,18 +442,18 @@ - Tor configuration is available only when running an embedded zcashd. - Tor配置仅在运行嵌入的zcashd时可用。 + Tor configuration is available only when running an embedded hushd. + Tor配置仅在运行嵌入的hushd时可用。 - You're using an external zcashd. Please restart zcashd with -rescan - 你正在使用外部zcashd。 请使用-rescan参数重新启动zcashd + You're using an external hushd. Please restart hushd with -rescan + 你正在使用外部hushd。 请使用-rescan参数重新启动hushd - You're using an external zcashd. Please restart zcashd with -reindex - 你正在使用外部zcashd。 请使用-reindex重新启动zcashd + You're using an external hushd. Please restart hushd with -reindex + 你正在使用外部hushd。 请使用-reindex重新启动hushd @@ -532,18 +532,18 @@ - Paste Zcash URI - 粘贴Zcash URI + Paste hush URI + 粘贴hush URI - Error paying zcash URI - 支付zcash URI时出错 + Error paying hush URI + 支付hush URI时出错 - URI should be of the form 'zcash:<addr>?amt=x&memo=y - URI的格式应为 'zcash:<addr>?amt=x&memo=y' + URI should be of the form 'hush:<addr>?amt=x&memo=y + URI的格式应为 'hush:<addr>?amt=x&memo=y' @@ -552,8 +552,8 @@ - The keys will be imported into your connected zcashd node - 密钥将导入已连接的zcashd节点 + The keys will be imported into your connected hushd node + 密钥将导入已连接的hushd节点 @@ -582,8 +582,8 @@ - You need to back it up from the machine zcashd is running on - 你需要从运行zcashd的机器备份它 + You need to back it up from the machine hushd is running on + 你需要从运行hushd的机器备份它 @@ -840,8 +840,8 @@ doesn't look like a z-address - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. - 如果启用，zcashd将慢慢将您的Sprout屏蔽资金迁移到您的Sapling地址。 + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. + 如果启用，hushd将慢慢将您的Sprout屏蔽资金迁移到您的Sapling地址。 @@ -942,8 +942,8 @@ doesn't look like a z-address - %1 doesn't seem to be a valid Zcash address. - %1 似乎不是有效的Zcash地址。 + %1 doesn't seem to be a valid hush address. + %1 似乎不是有效的hush地址。 @@ -997,46 +997,46 @@ doesn't look like a z-address - Starting embedded zcashd - 启动内嵌的zcashd + Starting embedded hushd + 启动内嵌的hushd - zcashd is set to run as daemon - zcashd设置为作为守护进程运行 + hushd is set to run as daemon + hushd设置为作为守护进程运行 - Waiting for zcashd - 等待zcashd + Waiting for hushd + 等待hushd - You have zcashd set to start as a daemon, which can cause problems with silentdragon + You have hushd set to start as a daemon, which can cause problems with silentdragon -.Please remove the following line from your zcash.conf and restart silentdragon +.Please remove the following line from your hush.conf and restart silentdragon daemon=1 - 你已经将zcashd设置为守护进程启动，这可能会导致silentdragon出现问题 + 你已经将hushd设置为守护进程启动，这可能会导致silentdragon出现问题 -。请从zcash.conf中删除以下行并重新启动silentdragon +。请从hush.conf中删除以下行并重新启动silentdragon daemon=1 - Couldn't start the embedded zcashd. + Couldn't start the embedded hushd. Please try restarting. -If you previously started zcashd with custom arguments, you might need to reset zcash.conf. +If you previously started hushd with custom arguments, you might need to reset hush.conf. -If all else fails, please run zcashd manually. - 无法启动内嵌的zcashd。 +If all else fails, please run hushd manually. + 无法启动内嵌的hushd。 请尝试重新启动。 -如果您之前使用自定义参数启动了zcashd，则可能需要重置zcash.conf。 +如果您之前使用自定义参数启动了hushd，则可能需要重置hush.conf。 -如果所有其他方法都失败了，请手动运行zcashd。 +如果所有其他方法都失败了，请手动运行hushd。 @@ -1045,12 +1045,12 @@ If all else fails, please run zcashd manually. - Couldn't connect to zcashd configured in zcash.conf. + Couldn't connect to hushd configured in hush.conf. -Not starting embedded zcashd because --no-embedded was passed - 无法连接到zcash.conf中配置的zcashd。 +Not starting embedded hushd because --no-embedded was passed + 无法连接到hush.conf中配置的hushd。 -没有启动内嵌的zcashd，因为已经传了--no-embedded参数 +没有启动内嵌的hushd，因为已经传了--no-embedded参数 @@ -1105,8 +1105,8 @@ Not starting embedded zcashd because --no-embedded was passed - zcashd error - zcashd 出错 + hushd error + hushd 出错 @@ -1119,22 +1119,22 @@ Please set the host/port and user/password in the Edit->Settings menu. - Could not connect to zcashd configured in settings. + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - 无法连接到设置中配置的zcashd。 + 无法连接到设置中配置的hushd。 请在编辑 - >设置菜单中设置主机/端口和用户/密码。 - Authentication failed. The username / password you specified was not accepted by zcashd. Try changing it in the Edit->Settings menu - 验证失败。 zcashd不接受您指定的用户名/密码。 请在编辑 - >设置菜单中更改它 + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu + 验证失败。 hushd不接受您指定的用户名/密码。 请在编辑 - >设置菜单中更改它 - Your zcashd is starting up. Please wait. - 你的zcashd正在启动。 请耐心等待。 + Your hushd is starting up. Please wait. + 你的hushd正在启动。 请耐心等待。 @@ -1260,18 +1260,18 @@ Please set the host/port and user/password in the Edit->Settings menu. - Connected to zcashd - 连接到zcashd + Connected to hushd + 连接到hushd - zcashd has no peer connections - zcashd没有节点可连接 + hushd has no peer connections + hushd没有节点可连接 - There was an error connecting to zcashd. The error was - 连接到zcashd时出错。 错误是 + There was an error connecting to hushd. The error was + 连接到hushd时出错。 错误是 @@ -1309,8 +1309,8 @@ Would you like to visit the releases page? - Waiting for zcashd to exit - 等待zcashd退出 + Waiting for hushd to exit + 等待hushd退出 @@ -1616,18 +1616,18 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. - 要求从树苗地址付款。 您将使用zcash支付URI将hush 0.0001交易发送到该地址。 当地址付款时，备注将包含在交易中。 + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. + 要求从树苗地址付款。 您将使用hush支付URI将hush 0.0001交易发送到该地址。 当地址付款时，备注将包含在交易中。 - Error paying zcash URI - 支付zcash URI时出错 + Error paying hush URI + 支付hush URI时出错 - URI should be of the form 'zcash:<addr>?amt=x&memo=y - URI的格式应为'zcash:<addr>?amt=x&memo=y‘ + URI should be of the form 'hush:<addr>?amt=x&memo=y + URI的格式应为'hush:<addr>?amt=x&memo=y‘ @@ -1659,8 +1659,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - zcashd connection - zcashd连接 + hushd connection + hushd连接 @@ -1982,8 +1982,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. - zcashd似乎没有任何可连接的节点。 您可能没有连接到互联网，因此此交易可能无效。 + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd似乎没有任何可连接的节点。 您可能没有连接到互联网，因此此交易可能无效。 @@ -1997,64 +1997,64 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - createZcashConf + createhushConf - - Configure zcash.conf - 配置 zcash.conf + + Configure hush.conf + 配置 hush.conf - - Your zcash node will be configured for you automatically - 您的zcash节点将自动为您配置 + + Your hush node will be configured for you automatically + 您的hush节点将自动为您配置 - + Enable Fast Sync 启用快速同步 - + Show Advanced Configuration 显示高级配置 - + Allow connections to the internet to check for updates, get hush/USD prices etc... 允许连接到互联网检查更新，获得hush/USD价格等… - + Use custom datadir 使用自定义datadir - + Choose directory 选择目录 - + Please note that you'll need to already have a Tor service configured on port 9050 请注意，您需要在端口9050上已经配置了Tor服务 - + Connect to the internet for updates and price feeds 连接到internet获取更新和价格数据 - + Please choose a directory to store your wallet.dat and blockchain 请选择一个目录来存储您的wallet.dat和区块链数据 - + Connect over Tor 连接到Tor - + <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> <html><head/><body><p>在初始块下载期间跳过了最费时的检查。 <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">了解更多</span></a></p></body></html> @@ -2141,8 +2141,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the ZCash blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> - <html><head/><body><p>ZBoard：基于ZCash区块链的完全匿名且无法追踪的聊天消息。 <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard: Fully anonymous and untraceable chat messages based on the hush blockchain. <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> + <html><head/><body><p>ZBoard：基于hush区块链的完全匿名且无法追踪的聊天消息。 <a href="http://www.z-board.net/"><span style=" text-decoration: underline; color:#0000ff;">http://www.z-board.net/</span></a></p></body></html> diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro index 41234f0..0a32d78 100644 --- a/silentdragon-lite.pro +++ b/silentdragon-lite.pro @@ -101,7 +101,7 @@ FORMS += \ src/connection.ui \ src/addressbook.ui \ src/mobileappconnector.ui \ - src/createzcashconfdialog.ui \ + src/createhushconfdialog.ui \ src/recurringdialog.ui \ src/newrecurring.ui \ src/requestdialog.ui \ diff --git a/silentdragonlite b/silentdragonlite index 5d3b067..ba2f44e 100755 Binary files a/silentdragonlite and b/silentdragonlite differ diff --git a/src/addressbook.cpp b/src/addressbook.cpp index 4dcb98f..76d135c 100644 --- a/src/addressbook.cpp +++ b/src/addressbook.cpp @@ -132,7 +132,7 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target) { // Test if address is valid. if (!Settings::isValidAddress(addr)) { QMessageBox::critical(parent, QObject::tr("Address Format Error"), - QObject::tr("%1 doesn't seem to be a valid Zcash address.") + QObject::tr("%1 doesn't seem to be a valid hush address.") .arg(addr), QMessageBox::Ok); return; diff --git a/src/confirm.ui b/src/confirm.ui index 96c1633..7bf4df6 100644 --- a/src/confirm.ui +++ b/src/confirm.ui @@ -180,7 +180,7 @@ color: red; - zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. + hushd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work. true diff --git a/src/connection.cpp b/src/connection.cpp index d34f2d3..2e56272 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -2,7 +2,7 @@ #include "mainwindow.h" #include "settings.h" #include "ui_connection.h" -#include "ui_createzcashconfdialog.h" +#include "ui_createhushconfdialog.h" #include "controller.h" #include "../lib/silentdragonlitelib.h" @@ -38,7 +38,7 @@ void ConnectionLoader::doAutoConnect() { auto config = std::shared_ptr(new ConnectionConfig()); config->dangerous = true; - config->server = QString("https://127.0.0.1:9069"); + config->server = QString("127.0.0.1:9069"); // Initialize the library main->logger->write(QObject::tr("Attempting to initialize")); diff --git a/src/connection.h b/src/connection.h index ec865b7..f19a5ac 100644 --- a/src/connection.h +++ b/src/connection.h @@ -26,7 +26,7 @@ public: void loadConnection(); private: - std::shared_ptr autoDetectZcashConf(); + std::shared_ptr autoDetecthushConf(); std::shared_ptr loadFromSettings(); Connection* makeConnection(std::shared_ptr config); @@ -95,7 +95,7 @@ private: }; /** - * Represents a connection to a zcashd. It may even start a new zcashd if needed. + * Represents a connection to a hushd. It may even start a new hushd if needed. * This is also a UI class, so it may show a dialog waiting for the connection. */ class Connection : public QObject { diff --git a/src/controller.cpp b/src/controller.cpp index deaa5b6..01e9a5a 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -42,7 +42,7 @@ Controller::Controller(MainWindow* main) { // Create the data model model = new DataModel(); - // Crate the ZcashdRPC + // Crate the hushdRPC zrpc = new LiteInterface(); } @@ -58,7 +58,7 @@ Controller::~Controller() { } -// Called when a connection to zcashd is available. +// Called when a connection to hushd is available. void Controller::setConnection(Connection* c) { if (c == nullptr) return; @@ -66,10 +66,10 @@ void Controller::setConnection(Connection* c) { ui->statusBar->showMessage("Ready!"); - // See if we need to remove the reindex/rescan flags from the zcash.conf file - auto zcashConfLocation = Settings::getInstance()->getZcashdConfLocation(); - Settings::removeFromZcashConf(zcashConfLocation, "rescan"); - Settings::removeFromZcashConf(zcashConfLocation, "reindex"); + // See if we need to remove the reindex/rescan flags from the hush.conf file + auto hushConfLocation = Settings::getInstance()->gethushdConfLocation(); + Settings::removeFromhushConf(hushConfLocation, "rescan"); + Settings::removeFromhushConf(hushConfLocation, "reindex"); // If we're allowed to get the hush Price, get the prices if (Settings::getInstance()->getAllowFetchPrices()) @@ -141,7 +141,7 @@ void Controller::noConnection() { ui->inputsCombo->clear(); } -/// This will refresh all the balance data from zcashd +/// This will refresh all the balance data from hushd void Controller::refresh(bool force) { if (!zrpc->haveConnection()) return noConnection(); @@ -178,7 +178,7 @@ void Controller::getInfoThenRefresh(bool force) { model->setLatestBlock(curBlock); //int version = reply["version"].get(); int version = 1; - Settings::getInstance()->setZcashdVersion(version); + Settings::getInstance()->sethushdVersion(version); // See if recurring payments needs anything Recurring::getInstance()->processPending(main); @@ -192,14 +192,14 @@ void Controller::getInfoThenRefresh(bool force) { refreshTransactions(); } }, [=](QString err) { - // zcashd has probably disappeared. + // hushd has probably disappeared. this->noConnection(); // Prevent multiple dialog boxes, because these are called async static bool shown = false; if (!shown && prevCallSucceeded) { // show error only first time shown = true; - QMessageBox::critical(main, QObject::tr("Connection Error"), QObject::tr("There was an error connecting to zcashd. The error was") + ": \n\n" + QMessageBox::critical(main, QObject::tr("Connection Error"), QObject::tr("There was an error connecting to hushd. The error was") + ": \n\n" + err, QMessageBox::StandardButton::Ok); shown = false; } @@ -434,7 +434,7 @@ void Controller::checkForUpdate(bool silent) { if (!zrpc->haveConnection()) return noConnection(); - QUrl cmcURL("https://api.github.com/repos/ZcashFoundation/silentdragon/releases"); + QUrl cmcURL("https://api.github.com/repos/hushFoundation/silentdragon/releases"); QNetworkRequest req; req.setUrl(cmcURL); @@ -482,7 +482,7 @@ void Controller::checkForUpdate(bool silent) { .arg(currentVersion.toString()), QMessageBox::Yes, QMessageBox::Cancel); if (ans == QMessageBox::Yes) { - QDesktopServices::openUrl(QUrl("https://github.com/ZcashFoundation/silentdragon/releases")); + QDesktopServices::openUrl(QUrl("https://github.com/hushFoundation/silentdragon/releases")); } else { // If the user selects cancel, don't bother them again for this version s.setValue("update/lastversion", maxVersion.toString()); @@ -559,10 +559,10 @@ void Controller::refreshhushPrice() { }); } -void Controller::shutdownZcashd() { - // Shutdown embedded zcashd if it was started - if (ezcashd == nullptr || ezcashd->processId() == 0 || !zrpc->haveConnection()) { - // No zcashd running internally, just return +void Controller::shutdownhushd() { + // Shutdown embedded hushd if it was started + if (ehushd == nullptr || ehushd->processId() == 0 || !zrpc->haveConnection()) { + // No hushd running internally, just return return; } @@ -580,7 +580,7 @@ void Controller::shutdownZcashd() { // connD.setupUi(&d); // connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); // connD.status->setText(QObject::tr("Please wait for silentdragon to exit")); - // connD.statusDetail->setText(QObject::tr("Waiting for zcashd to exit")); + // connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit")); // QTimer waiter(main); @@ -590,9 +590,9 @@ void Controller::shutdownZcashd() { // QObject::connect(&waiter, &QTimer::timeout, [&] () { // waitCount++; - // if ((ezcashd->atEnd() && ezcashd->processId() == 0) || + // if ((ehushd->atEnd() && ehushd->processId() == 0) || // waitCount > 30 || - // getConnection()->config->zcashDaemon) { // If zcashd is daemon, then we don't have to do anything else + // getConnection()->config->hushDaemon) { // If hushd is daemon, then we don't have to do anything else // qDebug() << "Ended"; // waiter.stop(); // QTimer::singleShot(1000, [&]() { d.accept(); }); @@ -602,7 +602,7 @@ void Controller::shutdownZcashd() { // }); // waiter.start(1000); - // // Wait for the zcash process to exit. + // // Wait for the hush process to exit. // if (!Settings::getInstance()->isHeadless()) { // d.exec(); // } else { diff --git a/src/controller.h b/src/controller.h index b9dae59..28a2653 100644 --- a/src/controller.h +++ b/src/controller.h @@ -21,7 +21,7 @@ struct WatchedTx { }; struct MigrationStatus { - bool available; // Whether the underlying zcashd supports migration? + bool available; // Whether the underlying hushd supports migration? bool enabled; QString saplingAddress; double unmigrated; @@ -57,9 +57,9 @@ public: const TxTableModel* getTransactionsModel() { return transactionsTableModel; } - void shutdownZcashd(); + void shutdownhushd(); void noConnection(); - bool isEmbedded() { return ezcashd != nullptr; } + bool isEmbedded() { return ehushd != nullptr; } void createNewZaddr(bool sapling, const std::function& cb) { zrpc->createNewZaddr(sapling, cb); } void createNewTaddr(const std::function& cb) { zrpc->createNewTaddr(cb); } @@ -83,7 +83,7 @@ private: void getInfoThenRefresh(bool force); - QProcess* ezcashd = nullptr; + QProcess* ehushd = nullptr; TxTableModel* transactionsTableModel = nullptr; BalancesTableModel* balancesTableModel = nullptr; diff --git a/src/createzcashconfdialog.ui b/src/createhushconfdialog.ui similarity index 96% rename from src/createzcashconfdialog.ui rename to src/createhushconfdialog.ui index 5b451df..3dec211 100644 --- a/src/createzcashconfdialog.ui +++ b/src/createhushconfdialog.ui @@ -1,7 +1,7 @@ - createZcashConf - + createhushConf + 0 @@ -11,13 +11,13 @@ - Configure zcash.conf + Configure hush.conf - Your zcash node will be configured for you automatically + Your hush node will be configured for you automatically Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -239,7 +239,7 @@ buttonBox accepted() - createZcashConf + createhushConf accept() @@ -255,7 +255,7 @@ buttonBox rejected() - createZcashConf + createhushConf reject() diff --git a/src/liteinterface.h b/src/liteinterface.h index 6df9662..59ef16c 100644 --- a/src/liteinterface.h +++ b/src/liteinterface.h @@ -1,5 +1,5 @@ -#ifndef ZCASHDRPC_H -#define ZCASHDRPC_H +#ifndef hushDRPC_H +#define hushDRPC_H #include "precompiled.h" @@ -61,4 +61,4 @@ private: Connection* conn = nullptr; }; -#endif // ZCASHDRPC_H +#endif // hushDRPC_H diff --git a/src/main.cpp b/src/main.cpp index 645ecf4..2c8c75f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -147,20 +147,20 @@ public: // Command line parser QCommandLineParser parser; - parser.setApplicationDescription("Shielded desktop light wallet for Zcash"); + parser.setApplicationDescription("Shielded desktop light wallet for hush"); parser.addHelpOption(); // Add an option to specify the conf file - QCommandLineOption confOption(QStringList() << "conf", "Use the zcash.conf specified instead of looking for the default one.", + QCommandLineOption confOption(QStringList() << "conf", "Use the hush.conf specified instead of looking for the default one.", "confFile"); parser.addOption(confOption); - // Positional argument will specify a zcash payment URI - parser.addPositionalArgument("zcashURI", "An optional zcash URI to pay"); + // Positional argument will specify a hush payment URI + parser.addPositionalArgument("hushURI", "An optional hush URI to pay"); parser.process(a); - // Check for a positional argument indicating a zcash payment URI + // Check for a positional argument indicating a hush payment URI if (a.isSecondary()) { if (parser.positionalArguments().length() > 0) { a.sendMessage(parser.positionalArguments()[0].toUtf8()); @@ -210,7 +210,7 @@ public: // Check to see if a conf location was specified if (parser.isSet(confOption)) { - Settings::getInstance()->setUsingZcashConf(parser.value(confOption)); + Settings::getInstance()->setUsinghushConf(parser.value(confOption)); } w = new MainWindow(); @@ -218,15 +218,15 @@ public: // If there was a payment URI on the command line, pay it if (parser.positionalArguments().length() > 0) { - w->payZcashURI(parser.positionalArguments()[0]); + w->payhushURI(parser.positionalArguments()[0]); } - // Listen for any secondary instances telling us about a zcash payment URI + // Listen for any secondary instances telling us about a hush payment URI QObject::connect(&a, &SingleApplication::receivedMessage, [=] (quint32, QByteArray msg) { QString uri(msg); // We need to execute this async, otherwise the app seems to crash for some reason. - QTimer::singleShot(1, [=]() { w->payZcashURI(uri); }); + QTimer::singleShot(1, [=]() { w->payhushURI(uri); }); }); // For MacOS, we have an event filter diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a5822e7..1939560 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -55,7 +55,7 @@ MainWindow::MainWindow(QWidget *parent) : // File a bug QObject::connect(ui->actionFile_a_bug, &QAction::triggered, [=]() { - QDesktopServices::openUrl(QUrl("https://github.com/zcashfoundation/silentdragon/issues/new")); + QDesktopServices::openUrl(QUrl("https://github.com/hushfoundation/silentdragon/issues/new")); }); // Set up check for updates action @@ -69,14 +69,14 @@ MainWindow::MainWindow(QWidget *parent) : Recurring::getInstance()->showRecurringDialog(this); }); - // Request zcash - QObject::connect(ui->actionRequest_zcash, &QAction::triggered, [=]() { - RequestDialog::showRequestZcash(this); + // Request hush + QObject::connect(ui->actionRequest_hush, &QAction::triggered, [=]() { + RequestDialog::showRequesthush(this); }); - // Pay Zcash URI + // Pay hush URI QObject::connect(ui->actionPay_URI, &QAction::triggered, [=] () { - payZcashURI(); + payhushURI(); }); // Export All Private Keys @@ -116,15 +116,15 @@ MainWindow::MainWindow(QWidget *parent) : ui->tabWidget->setCurrentIndex(0); - // The zcashd tab is hidden by default, and only later added in if the embedded zcashd is started - zcashdtab = ui->tabWidget->widget(4); + // The hushd tab is hidden by default, and only later added in if the embedded hushd is started + hushdtab = ui->tabWidget->widget(4); ui->tabWidget->removeTab(4); setupSendTab(); setupTransactionsTab(); setupReceiveTab(); setupBalancesTab(); - setupZcashdTab(); + setuphushdTab(); rpc = new Controller(this); @@ -198,7 +198,7 @@ void MainWindow::closeEvent(QCloseEvent* event) { s.sync(); // Let the RPC know to shut down any running service. - rpc->shutdownZcashd(); + rpc->shutdownhushd(); // Bubble up if (event) @@ -296,17 +296,17 @@ void MainWindow::setupSettingsModal() { QIntValidator validator(0, 65535); settings.port->setValidator(&validator); - // If values are coming from zcash.conf, then disable all the fields - auto zcashConfLocation = Settings::getInstance()->getZcashdConfLocation(); - if (!zcashConfLocation.isEmpty()) { - settings.confMsg->setText("Settings are being read from \n" + zcashConfLocation); + // If values are coming from hush.conf, then disable all the fields + auto hushConfLocation = Settings::getInstance()->gethushdConfLocation(); + if (!hushConfLocation.isEmpty()) { + settings.confMsg->setText("Settings are being read from \n" + hushConfLocation); settings.hostname->setEnabled(false); settings.port->setEnabled(false); settings.rpcuser->setEnabled(false); settings.rpcpassword->setEnabled(false); } else { - settings.confMsg->setText("No local zcash.conf found. Please configure connection manually."); + settings.confMsg->setText("No local hush.conf found. Please configure connection manually."); settings.hostname->setEnabled(true); settings.port->setEnabled(true); settings.rpcuser->setEnabled(true); @@ -323,13 +323,13 @@ void MainWindow::setupSettingsModal() { // Connection tab by default settings.tabWidget->setCurrentIndex(0); - // Enable the troubleshooting options only if using embedded zcashd + // Enable the troubleshooting options only if using embedded hushd if (!rpc->isEmbedded()) { settings.chkRescan->setEnabled(false); - settings.chkRescan->setToolTip(tr("You're using an external zcashd. Please restart zcashd with -rescan")); + settings.chkRescan->setToolTip(tr("You're using an external hushd. Please restart hushd with -rescan")); settings.chkReindex->setEnabled(false); - settings.chkReindex->setToolTip(tr("You're using an external zcashd. Please restart zcashd with -reindex")); + settings.chkReindex->setToolTip(tr("You're using an external hushd. Please restart hushd with -reindex")); } if (settingsDialog.exec() == QDialog::Accepted) { @@ -351,7 +351,7 @@ void MainWindow::setupSettingsModal() { if (!isUsingTor && settings.chkTor->isChecked()) { // If "use tor" was previously unchecked and now checked - Settings::addToZcashConf(zcashConfLocation, "proxy=127.0.0.1:9050"); + Settings::addTohushConf(hushConfLocation, "proxy=127.0.0.1:9050"); rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050"; QMessageBox::information(this, tr("Enable Tor"), @@ -361,7 +361,7 @@ void MainWindow::setupSettingsModal() { if (isUsingTor && !settings.chkTor->isChecked()) { // If "use tor" was previously checked and now is unchecked - Settings::removeFromZcashConf(zcashConfLocation, "proxy"); + Settings::removeFromhushConf(hushConfLocation, "proxy"); rpc->getConnection()->config->proxy.clear(); QMessageBox::information(this, tr("Disable Tor"), @@ -369,7 +369,7 @@ void MainWindow::setupSettingsModal() { QMessageBox::Ok); } - if (zcashConfLocation.isEmpty()) { + if (hushConfLocation.isEmpty()) { // Save settings Settings::getInstance()->saveSettings( settings.hostname->text(), @@ -384,12 +384,12 @@ void MainWindow::setupSettingsModal() { // Check to see if rescan or reindex have been enabled bool showRestartInfo = false; if (settings.chkRescan->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "rescan=1"); + Settings::addTohushConf(hushConfLocation, "rescan=1"); showRestartInfo = true; } if (settings.chkReindex->isChecked()) { - Settings::addToZcashConf(zcashConfLocation, "reindex=1"); + Settings::addTohushConf(hushConfLocation, "reindex=1"); showRestartInfo = true; } @@ -472,8 +472,8 @@ void MainWindow::balancesReady() { // There is a pending URI payment (from the command line, or from a secondary instance), // process it. if (!pendingURIPayment.isEmpty()) { - qDebug() << "Paying zcash URI"; - payZcashURI(pendingURIPayment); + qDebug() << "Paying hush URI"; + payhushURI(pendingURIPayment); pendingURIPayment = ""; } @@ -486,7 +486,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) { if (event->type() == QEvent::FileOpen) { QFileOpenEvent *fileEvent = static_cast(event); if (!fileEvent->url().isEmpty()) - payZcashURI(fileEvent->url().toString()); + payhushURI(fileEvent->url().toString()); return true; } @@ -495,10 +495,10 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) { } -// Pay the Zcash URI by showing a confirmation window. If the URI parameter is empty, the UI +// Pay the hush URI by showing a confirmation window. If the URI parameter is empty, the UI // will prompt for one. If the myAddr is empty, then the default from address is used to send // the transaction. -void MainWindow::payZcashURI(QString uri, QString myAddr) { +void MainWindow::payhushURI(QString uri, QString myAddr) { // If the Payments UI is not ready (i.e, all balances have not loaded), defer the payment URI if (!isPaymentsReady()) { qDebug() << "Payment UI not ready, waiting for UI to pay URI"; @@ -508,8 +508,8 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) { // If there was no URI passed, ask the user for one. if (uri.isEmpty()) { - uri = QInputDialog::getText(this, tr("Paste Zcash URI"), - "Zcash URI" + QString(" ").repeated(180)); + uri = QInputDialog::getText(this, tr("Paste hush URI"), + "hush URI" + QString(" ").repeated(180)); } // If there's no URI, just exit @@ -520,8 +520,8 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) { qDebug() << "Received URI " << uri; PaymentURI paymentInfo = Settings::parseURI(uri); if (!paymentInfo.error.isEmpty()) { - QMessageBox::critical(this, tr("Error paying zcash URI"), - tr("URI should be of the form 'zcash:?amt=x&memo=y") + "\n" + paymentInfo.error); + QMessageBox::critical(this, tr("Error paying hush URI"), + tr("URI should be of the form 'hush:?amt=x&memo=y") + "\n" + paymentInfo.error); return; } @@ -558,7 +558,7 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) { // pui.buttonBox->button(QDialogButtonBox::Save)->setVisible(false); // pui.helpLbl->setText(QString() % // tr("Please paste your private keys (z-Addr or t-Addr) here, one per line") % ".\n" % -// tr("The keys will be imported into your connected zcashd node")); +// tr("The keys will be imported into your connected hushd node")); // if (d.exec() == QDialog::Accepted && !pui.privKeyTxt->toPlainText().trimmed().isEmpty()) { // auto rawkeys = pui.privKeyTxt->toPlainText().trimmed().split("\n"); @@ -599,7 +599,7 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) { */ void MainWindow::exportTransactions() { // First, get the export file name - QString exportName = "zcash-transactions-" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".csv"; + QString exportName = "hush-transactions-" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".csv"; QUrl csvName = QFileDialog::getSaveFileUrl(this, tr("Export transactions"), exportName, "CSV file (*.csv)"); @@ -615,24 +615,24 @@ void MainWindow::exportTransactions() { /** * Backup the wallet.dat file. This is kind of a hack, since it has to read from the filesystem rather than an RPC call - * This might fail for various reasons - Remote zcashd, non-standard locations, custom params passed to zcashd, many others + * This might fail for various reasons - Remote hushd, non-standard locations, custom params passed to hushd, many others */ void MainWindow::backupWalletDat() { if (!rpc->getConnection()) return; - // QDir zcashdir(rpc->getConnection()->config->zcashDir); - // QString backupDefaultName = "zcash-wallet-backup-" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".dat"; + // QDir hushdir(rpc->getConnection()->config->hushDir); + // QString backupDefaultName = "hush-wallet-backup-" + QDateTime::currentDateTime().toString("yyyyMMdd") + ".dat"; // if (Settings::getInstance()->isTestnet()) { - // zcashdir.cd("testnet3"); + // hushdir.cd("testnet3"); // backupDefaultName = "testnet-" + backupDefaultName; // } - // QFile wallet(zcashdir.filePath("wallet.dat")); + // QFile wallet(hushdir.filePath("wallet.dat")); // if (!wallet.exists()) { // QMessageBox::critical(this, tr("No wallet.dat"), tr("Couldn't find the wallet.dat on this computer") + "\n" + - // tr("You need to back it up from the machine zcashd is running on"), QMessageBox::Ok); + // tr("You need to back it up from the machine hushd is running on"), QMessageBox::Ok); // return; // } @@ -680,7 +680,7 @@ void MainWindow::exportKeys(QString addr) { // Wire up save button QObject::connect(pui.buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [=] () { QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), - allKeys ? "zcash-all-privatekeys.txt" : "zcash-privatekey.txt"); + allKeys ? "hush-all-privatekeys.txt" : "hush-privatekey.txt"); QFile file(fileName); if (!file.open(QIODevice::WriteOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); @@ -807,8 +807,8 @@ void MainWindow::setupBalancesTab() { }); } -void MainWindow::setupZcashdTab() { - ui->zcashdlogo->setBasePixmap(QPixmap(":/img/res/zcashdlogo.gif")); +void MainWindow::setuphushdTab() { + ui->hushdlogo->setBasePixmap(QPixmap(":/img/res/hushdlogo.gif")); } void MainWindow::setupTransactionsTab() { @@ -857,7 +857,7 @@ void MainWindow::setupTransactionsTab() { }); // Payment Request - if (!memo.isEmpty() && memo.startsWith("zcash:")) { + if (!memo.isEmpty() && memo.startsWith("hush:")) { menu.addAction(tr("View Payment Request"), [=] () { RequestDialog::showPaymentConfirmation(this, memo); }); diff --git a/src/mainwindow.h b/src/mainwindow.h index ca6432d..5967849 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -55,7 +55,7 @@ public: void stopWebsocket(); void balancesReady(); - void payZcashURI(QString uri = "", QString myAddr = ""); + void payhushURI(QString uri = "", QString myAddr = ""); void updateLabels(); void updateTAddrCombo(bool checked); @@ -72,7 +72,7 @@ public: QLabel* statusLabel; QLabel* statusIcon; QLabel* loadingLabel; - QWidget* zcashdtab; + QWidget* hushdtab; Logger* logger; @@ -88,7 +88,7 @@ private: void setupTransactionsTab(); void setupReceiveTab(); void setupBalancesTab(); - void setupZcashdTab(); + void setuphushdTab(); void setupSettingsModal(); void setupStatusBar(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 7aaa366..6f34714 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -905,13 +905,13 @@ - zcashd + hushd - + 0 @@ -1059,7 +1059,7 @@ &File - + @@ -1151,7 +1151,7 @@ - Pay zcash &URI... + Pay hush &URI... @@ -1167,9 +1167,9 @@ &Recurring Payments - + - Request zcash... + Request hush... diff --git a/src/migration.ui b/src/migration.ui index bfab766..588c864 100644 --- a/src/migration.ui +++ b/src/migration.ui @@ -78,7 +78,7 @@ - If enabled, zcashd will slowly migrate your Sprout shielded funds to your Sapling address. + If enabled, hushd will slowly migrate your Sprout shielded funds to your Sapling address. true diff --git a/src/requestdialog.cpp b/src/requestdialog.cpp index 0a9832a..28806cc 100644 --- a/src/requestdialog.cpp +++ b/src/requestdialog.cpp @@ -47,8 +47,8 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog* void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI) { PaymentURI payInfo = Settings::parseURI(paymentURI); if (!payInfo.error.isEmpty()) { - QMessageBox::critical(main, tr("Error paying zcash URI"), - tr("URI should be of the form 'zcash:?amt=x&memo=y") + "\n" + payInfo.error); + QMessageBox::critical(main, tr("Error paying hush URI"), + tr("URI should be of the form 'hush:?amt=x&memo=y") + "\n" + payInfo.error); return; } @@ -80,12 +80,12 @@ void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI req.lblHeader->setText(tr("You are paying a payment request. Your address will not be visible to the person requesting this payment.")); if (d.exec() == QDialog::Accepted) { - main->payZcashURI(paymentURI, req.cmbMyAddress->currentText()); + main->payhushURI(paymentURI, req.cmbMyAddress->currentText()); } } // Static method that shows the request dialog -void RequestDialog::showRequestZcash(MainWindow* main) { +void RequestDialog::showRequesthush(MainWindow* main) { QDialog d(main); Ui_RequestDialog req; @@ -123,17 +123,17 @@ void RequestDialog::showRequestZcash(MainWindow* main) { req.txtFrom->setFocus(); if (d.exec() == QDialog::Accepted) { - // Construct a zcash Payment URI with the data and pay it immediately. - QString memoURI = "zcash:" + req.cmbMyAddress->currentText() + // Construct a hush Payment URI with the data and pay it immediately. + QString memoURI = "hush:" + req.cmbMyAddress->currentText() + "?amt=" + Settings::getDecimalString(req.txtAmount->text().toDouble()) + "&memo=" + QUrl::toPercentEncoding(req.txtMemo->toPlainText()); - QString sendURI = "zcash:" + AddressBook::addressFromAddressLabel(req.txtFrom->text()) + QString sendURI = "hush:" + AddressBook::addressFromAddressLabel(req.txtFrom->text()) + "?amt=0.0001" + "&memo=" + QUrl::toPercentEncoding(memoURI); // If the disclosed address in the memo doesn't have a balance, it will automatically fallback to the default // sapling address - main->payZcashURI(sendURI, req.cmbMyAddress->currentText()); + main->payhushURI(sendURI, req.cmbMyAddress->currentText()); } } diff --git a/src/requestdialog.h b/src/requestdialog.h index 6e53234..6ed5404 100644 --- a/src/requestdialog.h +++ b/src/requestdialog.h @@ -17,7 +17,7 @@ public: explicit RequestDialog(QWidget *parent = nullptr); ~RequestDialog(); - static void showRequestZcash(MainWindow* main); + static void showRequesthush(MainWindow* main); static void showPaymentConfirmation(MainWindow* main, QString paymentURI); static void setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog* req); private: diff --git a/src/requestdialog.ui b/src/requestdialog.ui index d9bb2ad..952f780 100644 --- a/src/requestdialog.ui +++ b/src/requestdialog.ui @@ -216,7 +216,7 @@ - Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a zcash payment URI. The memo will be included in the transaction when the address pays you. + Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you. true diff --git a/src/scripts/control b/src/scripts/control index 9166acc..b485c27 100644 --- a/src/scripts/control +++ b/src/scripts/control @@ -3,7 +3,7 @@ Version: RELEASE_VERSION Section: base Priority: optional Architecture: amd64 -Maintainer: Aditya Kulkarni -Description: silentdragon is a full node and UI wallet for Zcash. - silentdragon is a full node and UI wallet for Zcash. It comes with - full support for shielded addresses and many apps for Zcash. +Maintainer: Aditya Kulkarni +Description: silentdragon is a full node and UI wallet for hush. + silentdragon is a full node and UI wallet for hush. It comes with + full support for shielded addresses and many apps for hush. diff --git a/src/scripts/desktopentry b/src/scripts/desktopentry index 905b0d4..4a18661 100644 --- a/src/scripts/desktopentry +++ b/src/scripts/desktopentry @@ -1,6 +1,6 @@ [Desktop Entry] Name=silentdragon -Comment=Full node and wallet for Zcash +Comment=Full node and wallet for hush GenericName=Wallet Exec=/usr/local/bin/silentdragon %u Icon=silentdragon.xpm @@ -8,6 +8,6 @@ Type=Application StartupNotify=true StartupWMClass=silentdragon Categories=Utility; -MimeType=x-scheme-handler/zcash; +MimeType=x-scheme-handler/hush; Keywords=silentdragon; diff --git a/src/scripts/dounifiedbuild.ps1 b/src/scripts/dounifiedbuild.ps1 index f811ccd..9afd459 100644 --- a/src/scripts/dounifiedbuild.ps1 +++ b/src/scripts/dounifiedbuild.ps1 @@ -27,7 +27,7 @@ Write-Host "" Write-Host "[Building on Mac]" -bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --zcash_path ~/prod/zcash +bash src/scripts/mkmacdmg.sh --qt_path ~/Qt/5.11.1/clang_64/ --version $version --hush_path ~/prod/hush if (! $?) { Write-Output "[Error]" exit 1; diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh index b8c5334..3d8fe43 100755 --- a/src/scripts/mkmacdmg.sh +++ b/src/scripts/mkmacdmg.sh @@ -12,8 +12,8 @@ case $key in shift # past argument shift # past value ;; - -z|--zcash_path) - ZCASH_DIR="$2" + -z|--hush_path) + hush_DIR="$2" shift # past argument shift # past value ;; @@ -35,8 +35,8 @@ if [ -z $QT_PATH ]; then exit 1; fi -if [ -z $ZCASH_DIR ]; then - echo "ZCASH_DIR is not set. Please set it to the base directory of a compiled zcashd"; +if [ -z $hush_DIR ]; then + echo "hush_DIR is not set. Please set it to the base directory of a compiled hushd"; exit 1; fi @@ -45,8 +45,8 @@ if [ -z $APP_VERSION ]; then exit 1; fi -if [ ! -f $ZCASH_DIR/src/zcashd ]; then - echo "Could not find compiled zcashd in $ZCASH_DIR/src/."; +if [ ! -f $hush_DIR/src/hushd ]; then + echo "Could not find compiled hushd in $hush_DIR/src/."; exit 1; fi @@ -80,8 +80,8 @@ echo -n "Deploying.............." mkdir artifacts >/dev/null 2>&1 rm -f artifcats/silentdragon.dmg >/dev/null 2>&1 rm -f artifacts/rw* >/dev/null 2>&1 -cp $ZCASH_DIR/src/zcashd silentdragon.app/Contents/MacOS/ -cp $ZCASH_DIR/src/zcash-cli silentdragon.app/Contents/MacOS/ +cp $hush_DIR/src/hushd silentdragon.app/Contents/MacOS/ +cp $hush_DIR/src/hush-cli silentdragon.app/Contents/MacOS/ $QT_PATH/bin/macdeployqt silentdragon.app echo "[OK]" diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 48a8b46..f3203e0 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -7,37 +7,37 @@ fi if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi -if [ -z $ZCASH_DIR ]; then - echo "ZCASH_DIR is not set. Please set it to the base directory of a Zcash project with built Zcash binaries." +if [ -z $hush_DIR ]; then + echo "hush_DIR is not set. Please set it to the base directory of a hush project with built hush binaries." exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcashd ]; then - echo "Couldn't find zcashd in $ZCASH_DIR/artifacts/. Please build zcashd." +if [ ! -f $hush_DIR/artifacts/hushd ]; then + echo "Couldn't find hushd in $hush_DIR/artifacts/. Please build hushd." exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli ]; then - echo "Couldn't find zcash-cli in $ZCASH_DIR/artifacts/. Please build zcashd." +if [ ! -f $hush_DIR/artifacts/hush-cli ]; then + echo "Couldn't find hush-cli in $hush_DIR/artifacts/. Please build hushd." exit 1; fi -# Ensure that zcashd is the right build -echo -n "zcashd version........." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd && ! readelf -s $ZCASH_DIR/artifacts/zcashd | grep -q "GLIBC_2\.25"; then +# Ensure that hushd is the right build +echo -n "hushd version........." +if grep -q "zqwMagicBean" $hush_DIR/artifacts/hushd && ! readelf -s $hush_DIR/artifacts/hushd | grep -q "GLIBC_2\.25"; then echo "[OK]" else echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build or zcashd is built with libc 2.25" + echo "hushd doesn't seem to be a zqwMagicBean build or hushd is built with libc 2.25" exit 1 fi -echo -n "zcashd.exe version....." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd.exe; then +echo -n "hushd.exe version....." +if grep -q "zqwMagicBean" $hush_DIR/artifacts/hushd.exe; then echo "[OK]" else echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build" + echo "hushd doesn't seem to be a zqwMagicBean build" exit 1 fi @@ -86,8 +86,8 @@ mkdir bin/silentdragon-v$APP_VERSION > /dev/null strip silentdragon cp silentdragon bin/silentdragon-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcashd bin/silentdragon-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli bin/silentdragon-v$APP_VERSION > /dev/null +cp $hush_DIR/artifacts/hushd bin/silentdragon-v$APP_VERSION > /dev/null +cp $hush_DIR/artifacts/hush-cli bin/silentdragon-v$APP_VERSION > /dev/null cp README.md bin/silentdragon-v$APP_VERSION > /dev/null cp LICENSE bin/silentdragon-v$APP_VERSION > /dev/null @@ -122,7 +122,7 @@ mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control cp silentdragon $debdir/usr/local/bin/ -cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd +cp $hush_DIR/artifacts/hushd $debdir/usr/local/bin/zqw-hushd mkdir -p $debdir/usr/share/pixmaps/ cp res/silentdragon.xpm $debdir/usr/share/pixmaps/ @@ -145,14 +145,14 @@ if [ -z $MXE_PATH ]; then exit 0; fi -if [ ! -f $ZCASH_DIR/artifacts/zcashd.exe ]; then - echo "Couldn't find zcashd.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" +if [ ! -f $hush_DIR/artifacts/hushd.exe ]; then + echo "Couldn't find hushd.exe in $hush_DIR/artifacts/. Please build hushd.exe" exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli.exe ]; then - echo "Couldn't find zcash-cli.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" +if [ ! -f $hush_DIR/artifacts/hush-cli.exe ]; then + echo "Couldn't find hush-cli.exe in $hush_DIR/artifacts/. Please build hushd.exe" exit 1; fi @@ -176,8 +176,8 @@ echo "[OK]" echo -n "Packaging.............." mkdir release/silentdragon-v$APP_VERSION cp release/silentdragon.exe release/silentdragon-v$APP_VERSION -cp $ZCASH_DIR/artifacts/zcashd.exe release/silentdragon-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli.exe release/silentdragon-v$APP_VERSION > /dev/null +cp $hush_DIR/artifacts/hushd.exe release/silentdragon-v$APP_VERSION > /dev/null +cp $hush_DIR/artifacts/hush-cli.exe release/silentdragon-v$APP_VERSION > /dev/null cp README.md release/silentdragon-v$APP_VERSION cp LICENSE release/silentdragon-v$APP_VERSION cd release && zip -r Windows-binaries-silentdragon-v$APP_VERSION.zip silentdragon-v$APP_VERSION/ > /dev/null diff --git a/src/scripts/mkwininstaller.ps1 b/src/scripts/mkwininstaller.ps1 index 9e80895..a3bc73b 100644 --- a/src/scripts/mkwininstaller.ps1 +++ b/src/scripts/mkwininstaller.ps1 @@ -10,8 +10,8 @@ New-Item release/wininstaller -itemtype directory | Out-Null Copy-Item release/$target/silentdragon.exe release/wininstaller/ Copy-Item release/$target/LICENSE release/wininstaller/ Copy-Item release/$target/README.md release/wininstaller/ -Copy-Item release/$target/zcashd.exe release/wininstaller/ -Copy-Item release/$target/zcash-cli.exe release/wininstaller/ +Copy-Item release/$target/hushd.exe release/wininstaller/ +Copy-Item release/$target/hush-cli.exe release/wininstaller/ Get-Content src/scripts/hush-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/hush-qt-wallet.wxs diff --git a/src/scripts/zec-qt-wallet.wxs b/src/scripts/zec-qt-wallet.wxs index 6a17f7c..e248fbe 100644 --- a/src/scripts/zec-qt-wallet.wxs +++ b/src/scripts/zec-qt-wallet.wxs @@ -61,13 +61,13 @@ - - + + - + - + diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 1a0581a..c2be1c8 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -532,7 +532,7 @@ Tx MainWindow::createTxFromSendPage() { if (Settings::getInstance()->getAutoShield() && sendChangeToSapling) { auto saplingAddr = std::find_if(rpc->getModel()->getAllZAddresses().begin(), rpc->getModel()->getAllZAddresses().end(), [=](auto i) -> bool { - // We're finding a sapling address that is not one of the To addresses, because zcash doesn't allow duplicated addresses + // We're finding a sapling address that is not one of the To addresses, because hush doesn't allow duplicated addresses bool isSapling = Settings::getInstance()->isSaplingAddress(i); if (!isSapling) return false; diff --git a/src/settings.cpp b/src/settings.cpp index dfb94f0..0351b18 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -40,7 +40,7 @@ void Settings::saveSettings(const QString& host, const QString& port, const QStr init(); } -void Settings::setUsingZcashConf(QString confLocation) { +void Settings::setUsinghushConf(QString confLocation) { if (!confLocation.isEmpty()) _confLocation = confLocation; } @@ -82,12 +82,12 @@ bool Settings::isTAddress(QString addr) { return addr.startsWith("t"); } -int Settings::getZcashdVersion() { - return _zcashdVersion; +int Settings::gethushdVersion() { + return _hushdVersion; } -void Settings::setZcashdVersion(int version) { - _zcashdVersion = version; +void Settings::sethushdVersion(int version) { + _hushdVersion = version; } bool Settings::isSyncing() { @@ -268,7 +268,7 @@ QString Settings::getDonationAddr() { } -bool Settings::addToZcashConf(QString confLocation, QString line) { +bool Settings::addTohushConf(QString confLocation, QString line) { QFile file(confLocation); if (!file.open(QIODevice::ReadWrite | QIODevice::Append)) return false; @@ -281,7 +281,7 @@ bool Settings::addToZcashConf(QString confLocation, QString line) { return true; } -bool Settings::removeFromZcashConf(QString confLocation, QString option) { +bool Settings::removeFromhushConf(QString confLocation, QString option) { if (confLocation.isEmpty()) return false; @@ -362,12 +362,12 @@ QString Settings::paymentURIPretty(PaymentURI uri) { PaymentURI Settings::parseURI(QString uri) { PaymentURI ans; - if (!uri.startsWith("zcash:")) { - ans.error = "Not a zcash payment URI"; + if (!uri.startsWith("hush:")) { + ans.error = "Not a HUSH payment URI"; return ans; } - uri = uri.right(uri.length() - QString("zcash:").length()); + uri = uri.right(uri.length() - QString("hush:").length()); QRegExp re("([a-zA-Z0-9]+)"); int pos; diff --git a/src/settings.h b/src/settings.h index afd4195..deda019 100644 --- a/src/settings.h +++ b/src/settings.h @@ -42,8 +42,8 @@ public: bool isSyncing(); void setSyncing(bool syncing); - int getZcashdVersion(); - void setZcashdVersion(int version); + int gethushdVersion(); + void sethushdVersion(int version); void setUseEmbedded(bool r) { _useEmbedded = r; } bool useEmbedded() { return _useEmbedded; } @@ -74,8 +74,8 @@ public: bool isSaplingActive(); - void setUsingZcashConf(QString confLocation); - const QString& getZcashdConfLocation() { return _confLocation; } + void setUsinghushConf(QString confLocation); + const QString& gethushdConfLocation() { return _confLocation; } void sethushPrice(double p) { hushPrice = p; } double gethushPrice(); @@ -116,8 +116,8 @@ public: static bool isValidAddress(QString addr); - static bool addToZcashConf(QString confLocation, QString line); - static bool removeFromZcashConf(QString confLocation, QString option); + static bool addTohushConf(QString confLocation, QString line); + static bool removeFromhushConf(QString confLocation, QString option); static const QString labelRegExp; @@ -137,7 +137,7 @@ private: bool _isTestnet = false; bool _isSyncing = false; int _blockNumber = 0; - int _zcashdVersion = 0; + int _hushdVersion = 0; bool _useEmbedded = false; bool _headless = false; int _peerConnections = 0; diff --git a/src/settings.ui b/src/settings.ui index dbce2ed..baf1421 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -30,7 +30,7 @@ - zcashd connection + hushd connection diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index 5572750..dc1b19b 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -120,7 +120,7 @@ bool TxTableModel::exportToCsv(QString fileName) const { // If there are multiple memos, then mark them as such if (dat.items.length() == 1) { auto memo = dat.items[0].memo; - if (memo.startsWith("zcash:")) { + if (memo.startsWith("hush:")) { return Settings::paymentURIPretty(Settings::parseURI(memo)); } else { return modeldata->at(index.row()).type + @@ -159,7 +159,7 @@ bool TxTableModel::exportToCsv(QString fileName) const { } // If the memo is a Payment URI, then show a payment request icon - if (dat.items.length() == 1 && dat.items[0].memo.startsWith("zcash:")) { + if (dat.items.length() == 1 && dat.items[0].memo.startsWith("hush:")) { QIcon icon(":/icons/res/paymentreq.gif"); return QVariant(icon.pixmap(16, 16)); } else if (hasMemo) {