DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

rename to zec-qt-wallet

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-10-24 14:26:33 -07:00
parent 82c929db6a
commit 051f797331
13 changed files with 65 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/about.ui
View File

@@ -17,7 +17,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>zcash-qt-wallet</string>
<string>zec-qt-wallet</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

6
src/main.cpp
View File

@@ -16,13 +16,13 @@ int main(int argc, char *argv[])
qApp->setFont(QFont("Ubuntu", 11, QFont::Normal, false));
#endif
QCoreApplication::setOrganizationName("zcash-qt-wallet-org");
QCoreApplication::setApplicationName("zcash-qt-wallet");
QCoreApplication::setOrganizationName("zec-qt-wallet-org");
QCoreApplication::setApplicationName("zec-qt-wallet");
Settings::init();
MainWindow w;
w.setWindowTitle("zcash-qt-wallet v" + QString(APP_VERSION));
w.setWindowTitle("zec-qt-wallet v" + QString(APP_VERSION));
w.show();
return QApplication::exec();

4
src/mainwindow.cpp
View File

@@ -32,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent) :
// Set up check for updates action
QObject::connect(ui->actionCheck_for_Updates, &QAction::triggered, [=] () {
QDesktopServices::openUrl(QUrl("https://github.com/adityapk00/zcash-qt-wallet/releases"));
QDesktopServices::openUrl(QUrl("https://github.com/adityapk00/zec-qt-wallet/releases"));
});
QObject::connect(ui->actionImport_Private_Keys, &QAction::triggered, this, &MainWindow::importPrivKeys);
@@ -194,7 +194,7 @@ void MainWindow::donate() {
ui->Address1->setCursorPosition(0);
ui->Amount1->setText("0.01");
ui->statusBar->showMessage("Donate 0.01 " % Utils::getTokenName() % " to support zcash-qt-wallet");
ui->statusBar->showMessage("Donate 0.01 " % Utils::getTokenName() % " to support zec-qt-wallet");
// And switch to the send tab.
ui->tabWidget->setCurrentIndex(1);

2
src/mainwindow.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>zcash-qt-wallet</string>
<string>zec-qt-wallet</string>
</property>
<property name="windowIcon">
<iconset resource="../application.qrc">

12
src/rpc.cpp
View File

@@ -256,11 +256,11 @@ void RPC::handleConnectionError(const QString& error) {
error.contains("loading", Qt::CaseInsensitive)) {
explanation = QString()
% "\n\nIf you just started zcashd, then it's still loading and you might have to wait a while. If zcashd is ready, then you've run into "
% "something unexpected, and might need to file a bug report here: https://github.com/adityapk00/zcash-qt-wallet/issues";
% "something unexpected, and might need to file a bug report here: https://github.com/adityapk00/zec-qt-wallet/issues";
} else {
explanation = QString()
% "\n\nThis is most likely an internal error. Something unexpected happened. "
% "You might need to file a bug report here: https://github.com/adityapk00/zcash-qt-wallet/issues";
% "You might need to file a bug report here: https://github.com/adityapk00/zec-qt-wallet/issues";
}
msg.setText("There was a network connection error. The error was: \n\n"
@@ -400,20 +400,14 @@ void RPC::refreshReceivedZTrans(QList<QString> zaddrs) {
// Lookup txid in the map
auto txidInfo = txidDetails->value(txid);
// And then find the values
if (txidInfo == nullptr) {
std::cout << zaddr.toStdString() << std::endl;
std::cout << txid.toStdString() << std::endl;
}
unsigned long timestamp;
if (txidInfo.find("time") != txidInfo.end()) {
timestamp = txidInfo["time"].get<json::number_unsigned_t>();
} else {
timestamp = txidInfo["blocktime"].get<json::number_unsigned_t>();
}
auto amount = i["amount"].get<json::number_float_t>();
auto amount = i["amount"].get<json::number_float_t>();
auto confirmations = txidInfo["confirmations"].get<json::number_unsigned_t>();
TransactionItem tx{ QString("receive"), timestamp, zaddr, txid, amount, confirmations, "" };

26
src/scripts/mkrelease.sh
View File

@@ -6,7 +6,7 @@ if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi
echo -n "Version files."
# Replace the version number in the .pro file so it gets picked up everywhere
sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zcash-qt-wallet.pro > /dev/null
sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" zec-qt-wallet.pro > /dev/null
# Also update it in the README.md
sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null
@@ -14,21 +14,21 @@ echo "[OK]"
echo -n "Configuring..."
rm -f bin/linux-zcash-qt-wallet*
rm -f bin/linux-zec-qt-wallet*
make distclean > /dev/null
$QT_STATIC/bin/qmake zcash-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null
$QT_STATIC/bin/qmake zec-qt-wallet.pro -spec linux-clang CONFIG+=release > /dev/null
echo "[OK]"
echo -n "Building......"
rm -rf bin/zcash-qt-wallet* > /dev/null
rm -rf bin/zec-qt-wallet* > /dev/null
make -j$(nproc) > /dev/null
echo "[OK]"
# Test for Qt
echo -n "Static link..."
if [[ $(ldd zcash-qt-wallet | grep -i "Qt") ]]; then
if [[ $(ldd zec-qt-wallet | grep -i "Qt") ]]; then
echo "FOUND QT; ABORT";
exit 1
fi
@@ -36,19 +36,19 @@ echo "[OK]"
echo -n "Packaging....."
mkdir bin/zcash-qt-wallet-v$APP_VERSION > /dev/null
cp zcash-qt-wallet bin/zcash-qt-wallet-v$APP_VERSION > /dev/null
cp README.md bin/zcash-qt-wallet-v$APP_VERSION > /dev/null
cp LICENSE bin/zcash-qt-wallet-v$APP_VERSION > /dev/null
cd bin && tar cvf linux-zcash-qt-wallet-v$APP_VERSION.tar.gz zcash-qt-wallet-v$APP_VERSION/ > /dev/null
mkdir bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp zec-qt-wallet bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp README.md bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cp LICENSE bin/zec-qt-wallet-v$APP_VERSION > /dev/null
cd bin && tar cvf linux-zec-qt-wallet-v$APP_VERSION.tar.gz zec-qt-wallet-v$APP_VERSION/ > /dev/null
cd ..
if [ -f bin/linux-zcash-qt-wallet-v$APP_VERSION.tar.gz ] ; then
if [ -f bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then
echo "[OK]"
echo "Done. Build is bin/linux-zcash-qt-wallet-v$APP_VERSION.tar.gz"
echo "Done. Build is bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"
echo "Package contents:"
tar tf "bin/linux-zcash-qt-wallet-v$APP_VERSION.tar.gz"
tar tf "bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz"
else
echo "[ERROR]"
exit 1

8
src/scripts/mkwinrelease.ps1
View File

@@ -1,7 +1,7 @@
if (-not (Test-Path env:QT_DIR)) { echo "QT_DIR is not set. Please set it to the Qt directory from where you'd like to build. Usually, this is the installation directory of Qt."; exit; }
if (-not (Test-Path env:APP_VERSION)) { echo "APP_VERSION is not set. Please set it to the version you want to build, like 0.1.6"; exit; }
$target="zcash-qt-wallet-v$Env:APP_VERSION"
$target="zec-qt-wallet-v$Env:APP_VERSION"
echo "Cleaning"
nmake clean *>$null
@@ -10,17 +10,17 @@ Remove-Item -Path release -Recurse | Out-Null
# Run qmake
echo "Configuring"
& "$Env:QT_DIR\bin\qmake.exe" zcash-qt-wallet.pro -spec win32-msvc "CONFIG+=release"
& "$Env:QT_DIR\bin\qmake.exe" zec-qt-wallet.pro -spec win32-msvc "CONFIG+=release"
echo "Building"
nmake *>$null
# Make a dist directory in release
New-Item release/$target -itemtype directory | Out-Null
Move-Item release/zcash-qt-wallet.exe release/$target | Out-Null
Move-Item release/zec-qt-wallet.exe release/$target | Out-Null
echo "Copying"
# No need for deploy, since we're using a static Qt5 library
& "$Env:QT_DIR\bin\windeployqt.exe" release/$target/zcash-qt-wallet.exe *>$null
& "$Env:QT_DIR\bin\windeployqt.exe" release/$target/zec-qt-wallet.exe *>$null
Copy-Item LICENSE release/$target | Out-Null
Copy-Item README.md release/$target | Out-Null

2
src/ui_about.h
View File

@@ -73,7 +73,7 @@ public:
void retranslateUi(QDialog *about)
{
about->setWindowTitle(QApplication::translate("about", "Dialog", nullptr));
groupBox->setTitle(QApplication::translate("about", "zcash-qt-wallet", nullptr));
groupBox->setTitle(QApplication::translate("about", "zec-qt-wallet", nullptr));
versionLabel->setText(QApplication::translate("about", "Version", nullptr));
textEdit->setHtml(QApplication::translate("about", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"

2
src/ui_mainwindow.h
View File

@@ -683,7 +683,7 @@ public:
void retranslateUi(QMainWindow *MainWindow)
{
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zcash-qt-wallet", nullptr));
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zec-qt-wallet", nullptr));
actionExit->setText(QApplication::translate("MainWindow", "Exit", nullptr));
actionAbout->setText(QApplication::translate("MainWindow", "About", nullptr));
actionSettings->setText(QApplication::translate("MainWindow", "Settings", nullptr));