Fix animations on send and shutdown

Reviewed-on: hush/SilentDragon#73

.gitignore

@@ -6,8 +6,6 @@ docs/website/public
 .DS_Store
 hushd
 IDEWorkspaceChecks.plist
-komodo-cli
-komodod
 hush-cli
 hushd
 *.mak

build.sh

@@ -15,12 +15,6 @@ else
     JOBS=1
 fi
 
-# Check if qmake is installed on system and exits if it is not
-if ! [ -x "$(command -v qmake)" ]; then
-  echo 'Error: qmake is not installed. Install qmake and try again.' >&2
-  exit 1
-fi
-
 VERSION=$(cat src/version.h |cut -d\" -f2)
 echo "Compiling SilentDragon $VERSION with $JOBS threads..."
 CONF=silentdragon.pro

src/connection.cpp

@@ -17,20 +17,14 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, RPC* rpc) {
     d->setWindowFlags(d->windowFlags() & ~(Qt::WindowCloseButtonHint | Qt::WindowContextHelpButtonHint));
     connD = new Ui_ConnectionDialog();
     connD->setupUi(d);
-    QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-startup.gif");;
-    QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-startup-dark.gif");;
+    QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-startup-dark.gif");;
     auto theme = Settings::getInstance()->get_theme_name();
     auto size  = QSize(512,512);
 
-    if (theme == "dark" || theme == "midnight") {
-        movie2->setScaledSize(size);
-        connD->topIcon->setMovie(movie2);
-        movie2->start();
-    } else {
-        movie1->setScaledSize(size);
-        connD->topIcon->setMovie(movie1);
-        movie1->start();
-    }
+    movie1->setScaledSize(size);
+    connD->topIcon->setMovie(movie1);
+    movie1->start();
+
     main->logger->write("set animation");
     qDebug() << "set animation";
 }

src/rpc.cpp

@@ -1359,18 +1359,11 @@ void RPC::shutdownHushd() {
     connD.setupUi(&d);
     //connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
 
-    QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated.gif");;
-    QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
+    QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
     auto theme = Settings::getInstance()->get_theme_name();
-    if (theme == "dark" || theme == "midnight") {
-        movie2->setScaledSize(QSize(512,512));
-        connD.topIcon->setMovie(movie2);
-        movie2->start();
-    } else {
-        movie1->setScaledSize(QSize(512,512));
-        connD.topIcon->setMovie(movie1);
-        movie1->start();
-    }
+    movie1->setScaledSize(QSize(512,512));
+    connD.topIcon->setMovie(movie1);
+    movie1->start();
 
     connD.status->setText(QObject::tr("Please enhance your calm and wait for SilentDragon to exit"));
     connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit, y'all"));

src/scripts/mkmacdmg.sh

@@ -114,8 +114,6 @@ rm -f artifcats/silentdragon.dmg >/dev/null 2>&1
 rm -f artifacts/rw* >/dev/null 2>&1
 cp $HUSH_DIR/src/hushd silentdragon.app/Contents/MacOS/
 cp $HUSH_DIR/src/hush-cli silentdragon.app/Contents/MacOS/
-cp $HUSH_DIR/src/komodod silentdragon.app/Contents/MacOS/
-cp $HUSH_DIR/src/komodo-cli silentdragon.app/Contents/MacOS/
 cp $HUSH_DIR/sapling-output.params silentdragon.app/Contents/MacOS/
 cp $HUSH_DIR/sapling-spend.params silentdragon.app/Contents/MacOS/
 $QT_PATH/bin/macdeployqt silentdragon.app 

src/scripts/mkrelease.sh

@@ -21,18 +21,18 @@ if [ -z $HUSH_DIR ]; then
     exit 1;
 fi
 
-if [ ! -f $HUSH_DIR/komodod ]; then
-    echo "Couldn't find komodod in $HUSH_DIR . Please build komodod."
+if [ ! -f $HUSH_DIR/hushd ]; then
+    echo "Couldn't find hushd in $HUSH_DIR . Please build hushd."
     exit 1;
 fi
 
-if [ ! -f $HUSH_DIR/komodo-cli ]; then
-    echo "Couldn't find komodo-cli in $HUSH_DIR . Please build komodo-cli."
+if [ ! -f $HUSH_DIR/hush-cli ]; then
+    echo "Couldn't find hush-cli in $HUSH_DIR . Please build hush-cli."
     exit 1;
 fi
 
-if [ ! -f $HUSH_DIR/komodo-tx ]; then
-    echo "Couldn't find komodo-tx in $HUSH_DIR . Please build komodo-tx."
+if [ ! -f $HUSH_DIR/hush-tx ]; then
+    echo "Couldn't find hush-tx in $HUSH_DIR . Please build hush-tx."
     exit 1;
 fi
 
@@ -80,8 +80,8 @@ RELEASEFILE2=$RELEASEDIR-$OS-$ARCH.tar.gz
 
 # this is equal to the number of files we package plus 1, for the directory
 # that is created
-NUM_FILES1=10
-NUM_FILES2=12 # 2 additional param files
+NUM_FILES1=6
+NUM_FILES2=8 # 2 additional param files
 
 echo "Packaging.............."
 mkdir bin/$RELEASEDIR
@@ -92,18 +92,18 @@ strip silentdragon
 ls -la silentdragon
 
 cp silentdragon                  bin/$RELEASEDIR > /dev/null
-cp $HUSH_DIR/komodod    	 bin/$RELEASEDIR > /dev/null
-cp $HUSH_DIR/komodo-cli          bin/$RELEASEDIR > /dev/null
-cp $HUSH_DIR/komodo-tx           bin/$RELEASEDIR > /dev/null
+strip $HUSH_DIR/hushd
 cp $HUSH_DIR/hushd               bin/$RELEASEDIR > /dev/null
+strip $HUSH_DIR/hush-cli
 cp $HUSH_DIR/hush-cli            bin/$RELEASEDIR > /dev/null
-cp $HUSH_DIR/hush-tx             bin/$RELEASEDIR > /dev/null
+# I have yet to hear of somebody using this binary, it just bloats our archives
+#cp $HUSH_DIR/hush-tx             bin/$RELEASEDIR > /dev/null
 cp README.md                     bin/$RELEASEDIR > /dev/null
 cp LICENSE                       bin/$RELEASEDIR > /dev/null
 
 
 cd bin && tar czf $RELEASEFILE1 $RELEASEDIR/ #> /dev/null
-#ls -la $RELEASEDIR/
+ls -la $RELEASEDIR/
 echo "Created $RELEASEFILE1   [OK]"
 cd ..
 
@@ -121,7 +121,7 @@ else
 fi
 
 cd bin && tar czf $RELEASEFILE2 $RELEASEDIR/
-#ls -la $RELEASEDIR/
+ls -la $RELEASEDIR/
 echo "Created $RELEASEFILE2   [OK]"
 cd .. 
 
@@ -157,6 +157,8 @@ else
 fi
 
 cd bin
+du -sh $RELEASEFILE1
+du -sh $RELEASEFILE2
 echo "DONE! Checksums:"
 sha256sum $RELEASEFILE1
 sha256sum $RELEASEFILE2
@@ -177,7 +179,7 @@ cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIA
 
 cp silentdragon                   $debdir/usr/local/bin/
 # TODO: how does this interact with hushd deb ?
-cp $HUSH_DIR/artifacts/komodod $debdir/usr/local/bin/hush-komodod
+cp $HUSH_DIR/artifacts/hushd $debdir/usr/local/bin/hushd
 
 mkdir -p $debdir/usr/share/pixmaps/
 cp res/silentdragon.xpm           $debdir/usr/share/pixmaps/
@@ -202,14 +204,14 @@ if [ -z $MXE_PATH ]; then
     exit 0; 
 fi
 
-if [ ! -f $HUSH_DIR/artifacts/komodod.exe ]; then
-    echo "Couldn't find komodod.exe in $HUSH_DIR/artifacts/. Please build komodod.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 $HUSH_DIR/artifacts/komodo-cli.exe ]; then
-    echo "Couldn't find komodo-cli.exe in $HUSH_DIR/artifacts/. Please build komodod-cli.exe"
+if [ ! -f $HUSH_DIR/artifacts/hush-cli.exe ]; then
+    echo "Couldn't find hush-cli.exe in $HUSH_DIR/artifacts/. Please build hushd-cli.exe"
     exit 1;
 fi
 
@@ -234,10 +236,8 @@ echo "[OK]"
 echo -n "Packaging.............."
 mkdir release/silentdragon-v$APP_VERSION  
 cp release/silentdragon.exe          release/silentdragon-v$APP_VERSION 
-cp $HUSH_DIR/artifacts/komodod.exe    release/silentdragon-v$APP_VERSION > /dev/null
-cp $HUSH_DIR/artifacts/komodo-cli.exe   release/silentdragon-v$APP_VERSION > /dev/null
-cp $HUSH_DIR/artifacts/hushd.bat    release/silentdragon-v$APP_VERSION > /dev/null
-cp $HUSH_DIR/artifacts/hush-cli.bat   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

src/scripts/zec-qt-wallet.wxs → src/scripts/silentdragon.wxs

@@ -6,8 +6,8 @@
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate EmbedCab="yes"/>
 
-        <Icon Id="zecqtwalleticon.exe" SourceFile="res/icon.ico"/>
-        <Property Id="ARPPRODUCTICON" Value="zecqtwalleticon.exe" />
+        <Icon Id="silentdragonicon.exe" SourceFile="res/icon.ico"/>
+        <Property Id="ARPPRODUCTICON" Value="silentdragonicon.exe" />
 
 		<Feature Id="ProductFeature" Title="silent-dragon" Level="1">
 			<ComponentGroupRef Id="ProductComponents" /> 
@@ -57,12 +57,12 @@
 			<Component Id="ProductComponent" Guid="0D210F5A-53E0-4E7E-CAAD-15A26995505E">
                 <File Source="silentdragon.exe" KeyPath="yes">
                     <Shortcut Id="startMenuShotcut" Advertise="yes" Directory="ApplicationProgramsFolder"
-                        Name="silentdragon" WorkingDirectory="INSTALLFOLDER" Icon="zecqtwalleticon.exe" >
+                        Name="silentdragon" WorkingDirectory="INSTALLFOLDER" Icon="silentdragonicon.exe" >
                     </Shortcut>
                 </File>
                 <File Source="LICENSE" />
-                <File Source="komodod.exe" />
-                <File Source="komodo-cli.exe" />
+                <File Source="hushd.exe" />
+                <File Source="hush-cli.exe" />
                 <File Source="README.md" />
 
                 <RegistryKey Root="HKCR" Key="hush">

src/sendtab.cpp

@@ -702,18 +702,11 @@ void MainWindow::sendButton() {
         auto connD = new Ui_ConnectionDialog();
         connD->setupUi(d);
 
-        QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated.gif");;
-        QMovie *movie2 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
+        QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-dark.gif");;
         auto theme = Settings::getInstance()->get_theme_name();
-        if (theme == "dark" || theme == "midnight") {
-            movie2->setScaledSize(QSize(512,512));
-            connD->topIcon->setMovie(movie2);
-            movie2->start();
-        } else {
-            movie1->setScaledSize(QSize(512,512));
-            connD->topIcon->setMovie(movie1);
-            movie1->start();
-        }
+        movie1->setScaledSize(QSize(512,512));
+        connD->topIcon->setMovie(movie1);
+        movie1->start();
 
         //connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 

src/version.h

@@ -1 +1 @@
-#define APP_VERSION "1.3.0"
+#define APP_VERSION "1.3.1"