Browse Source

Merge branch 'dev' into duke

old_duke
Duke Leto 4 years ago
parent
commit
d7dc5c786f
  1. 28
      README.md
  2. BIN
      res/icon.ico
  3. BIN
      res/logo.icns
  4. 2
      src/version.h

28
README.md

@ -1,4 +1,22 @@
# SilentDragon # SilentDragon
[![GitHub license](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](https://github.com/MyHush/SilentDragon/blob/master/LICENSE)
[![GitHub version](https://badge.fury.io/gh/MyHush%2FSilentDragon.svg)](https://badge.fury.io/gh/MyHush%2FSilentDragon)
[![Github All Releases](https://img.shields.io/github/downloads/MyHush/SilentDragon/total.svg)](https://img.shields.io/github/downloads/MyHush/SilentDragon/total.svg)
<p align="left">
<a href="https://twitter.com/MyHushTeam">
<img src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fmyhushteam"
alt="MyHushTeam's Twitter"></a>
<a href="https://twitter.com/intent/follow?screen_name=MyHushTeam">
<img src="https://img.shields.io/twitter/follow/MyHushTeam?style=social&logo=twitter"
alt="follow on Twitter"></a>
<a href="https://fosstodon.org/@myhushteam">
<img src="https://img.shields.io/badge/Mastodon-MyHushTeam-blue"
alt="follow on Mastodon"></a>
<a href="https://www.reddit.com/r/Myhush/">
<img src="https://img.shields.io/reddit/subreddit-subscribers/Myhush?style=social"
alt="MyHushTeam's Reddit"></a>
</p>
SilentDragon desktop wallet for HUSH runs on Linux, Windows and macOS. SilentDragon desktop wallet for HUSH runs on Linux, Windows and macOS.
This is experimental software under active development! This is experimental software under active development!
@ -24,7 +42,7 @@ Go to the releases page and grab the latest installers or binary. https://github
## hushd ## hushd
SilentDragon needs a Hush full node running hushd. If you already have a hushd node running, SilentDragon will connect to it. SilentDragon needs a Hush full node running [hushd](https://github.com/MyHush/hush3/). If you already have a hushd node running, SilentDragon will connect to it.
If you don't have one, SilentDragon will start its embedded hushd node. If you don't have one, SilentDragon will start its embedded hushd node.
@ -40,10 +58,9 @@ c++. It also depends on Qt5, which you can get from
you won't get the embedded hushd by default. You can either run an external you won't get the embedded hushd by default. You can either run an external
hushd, or compile hushd as well. hushd, or compile hushd as well.
### Building on Linux ### Building on Linux
#### Ubuntu 18.04: #### Ubuntu 18.04 and 20.04:
``` ```
sudo apt-get -y install qt5-default qt5-qmake libqt5websockets5-dev qtcreator sudo apt-get -y install qt5-default qt5-qmake libqt5websockets5-dev qtcreator
@ -60,7 +77,7 @@ cd SilentDragon
sudo pacman -S qt5-base qt5-tools qtcreator qt5-websockets rust sudo pacman -S qt5-base qt5-tools qtcreator qt5-websockets rust
git clone https://github.com/MyHush/SilentDragon.git git clone https://github.com/MyHush/SilentDragon.git
cd SilentDragon cd SilentDragon
./build.sh linguist ./build.sh linguist # compile translations
./build.sh release ./build.sh release
./silentdragon ./silentdragon
``` ```
@ -87,7 +104,6 @@ c:\Qt5\bin\qmake.exe silentdragon.pro -tp vc CONFIG+=debug
You need to install the Xcode app or the Xcode command line tools first, and then install Qt. You need to install the Xcode app or the Xcode command line tools first, and then install Qt.
``` ```
git clone https://github.com/MyHush/SilentDragon.git git clone https://github.com/MyHush/SilentDragon.git
cd SilentDragon cd SilentDragon
@ -113,5 +129,5 @@ The above assumes silentdragon and hush3 git repos are in the same directory. Fi
### Support ### Support
For support or other questions, Join [Discord](https://myhush.org/discord), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam) or [file an issue](https://github.com/MyHush/SilentDragon/issues). For support or other questions, join us on [Discord](https://myhush.org/discord), or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam) or join [Telegram](http://myhush.org/telegram) or [file an issue](https://github.com/MyHush/SilentDragon/issues).

BIN
res/icon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 401 KiB

BIN
res/logo.icns

Binary file not shown.

2
src/version.h

@ -1 +1 @@
#define APP_VERSION "0.9.2" #define APP_VERSION "0.9.3"

Loading…
Cancel
Save