Merge branch 'dev'

MyHush · Nov 8, 2019 · 7232b17 · 7232b17
2 parents c98b953 + 30d0e1f
commit 7232b17
Show file tree

Hide file tree

Showing 101 changed files with 2,103 additions and 16,865 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,10 +12,7 @@ src/ui_*.h
 *.autosave
 src/precompiled.h.cpp
 .qmake.stash
-zecwallet
-zec-qt-wallet
-zec-qt-wallet.app
-ZecWallet.app
+silentdragon
 zec-qt-wallet-mingw*
 zec-qt-wallet.vcxproj*
 zecwallet.vcxproj*
@@ -34,6 +31,7 @@ workspace.code-workspace
 *.xcsettings
 .DS_Store
 *.mak
-zcashd
+komodod
+hushd
 IDEWorkspaceChecks.plist
 *.sln
diff --git a/application.qrc b/application.qrc
@@ -23,4 +23,20 @@
         <file>res/zec_qt_wallet_tr.qm</file>
         <file>res/zec_qt_wallet_uk.qm</file>
     </qresource>
+    <qresource prefix="/css">
+        <file>res/css/blue.css</file>
+        <file>res/css/dark.css</file>
+        <file>res/css/default.css</file>
+        <file>res/css/light.css</file>
+    </qresource>
+    <qresource prefix="/images/blue">
+        <file>res/images/blue/unchecked.png</file>
+        <file>res/images/blue/checked.png</file>
+        <file>res/images/blue/blue_downArrow.png</file>
+        <file>res/images/blue/blue_downArrow_small.png</file>
+        <file>res/images/blue/blue_upArrow_small.png</file>
+        <file>res/images/blue/blue_leftArrow_small.png</file>
+        <file>res/images/blue/blue_rightArrow_small.png</file>
+        <file>res/images/blue/blue_qtreeview_selected.png</file>
+    </qresource>
 </RCC>
diff --git a/build.sh b/build.sh
@@ -20,8 +20,8 @@ CONF=silentdragon.pro
 set -e
 qbuild () {
    qmake $CONF CONFIG+=debug
-   lupdate $CONF
-   lrelease $CONF
+   #lupdate $CONF
+   #lrelease $CONF
    make -j$JOBS
 }
 

diff --git a/docs/website/archetypes/default.md b/docs/website/archetypes/default.md
diff --git a/docs/website/config.toml b/docs/website/config.toml
diff --git a/docs/website/content/_index.md b/docs/website/content/_index.md
diff --git a/docs/website/content/about/_index.md b/docs/website/content/about/_index.md
diff --git a/docs/website/content/contact.md b/docs/website/content/contact.md
diff --git a/docs/website/content/post/_index.md b/docs/website/content/post/_index.md
diff --git a/docs/website/content/post/chapter-1.md b/docs/website/content/post/chapter-1.md
diff --git a/docs/website/content/post/chapter-2.md b/docs/website/content/post/chapter-2.md