From c172de1b9249a51a4e6d53f49fa3f831354479f6 Mon Sep 17 00:00:00 2001 From: parsicoin Date: Tue, 21 Aug 2018 19:33:39 +0430 Subject: [PATCH] v1.0.4 --- CMakeLists.txt | 8 ++++---- CryptoNoteWallet.cmake | 4 ++-- src/Settings.cpp | 4 ++-- src/cryptonotewallet.rc | 16 ++++++++-------- src/gui/PrivateKeysDialog.cpp | 9 +++++---- src/gui/ui/aboutdialog.ui | 2 +- src/gui/ui/privatekeysdialog.ui | 1 - ...{parsicoinwallet.desktop => parsipay.desktop} | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) rename src/{parsicoinwallet.desktop => parsipay.desktop} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d883284..2fe1530 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,9 +206,9 @@ elseif (UNIX) file(GLOB_RECURSE OBJC_SOURCES src/*.mm) set(SOURCES ${SOURCES} ${OBJC_SOURCES}) set(PLATFORM_DIR OSX) - set(MACOSX_BUNDLE_INFO_STRING "ParsiCoin GUI wallet") + set(MACOSX_BUNDLE_INFO_STRING "parsipay") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}") - set(MACOSX_BUNDLE_BUNDLE_NAME "ParsiPay") + set(MACOSX_BUNDLE_BUNDLE_NAME "parsipay") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}") set(MACOSX_BUNDLE_BUNDLE_VERSION "$${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}") @@ -269,7 +269,7 @@ qt5_use_modules(${PROJECT_NAME} Widgets Gui Network) set(CPACK_PACKAGE_NAME ${CN_PROJECT_NAME}) set(CPACK_PACKAGE_VERSION ${CN_VERSION}) set(CPACK_PACKAGE_VENDOR "parsicoin-project") -set(CPACK_PACKAGE_CONTACT "http://parsicoin.net") +set(CPACK_PACKAGE_CONTACT "https://parsicoin.net") set(CPACK_STRIP_FILES ON) if (APPLE) set(CPACK_GENERATOR DragNDrop) @@ -280,7 +280,7 @@ elseif (UNIX) install(PROGRAMS build/${PROJECT_NAME} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(FILES src/parsicoinwallet.desktop DESTINATION share/applications) + install(FILES src/parsipay.desktop DESTINATION share/applications) install(FILES src/images/parsicoinz.png DESTINATION share/pixmaps RENAME parsicoin.png) install(FILES copyright DESTINATION share/doc/parsicoin) diff --git a/CryptoNoteWallet.cmake b/CryptoNoteWallet.cmake index e530940..db33005 100644 --- a/CryptoNoteWallet.cmake +++ b/CryptoNoteWallet.cmake @@ -1,5 +1,5 @@ -set(CN_PROJECT_NAME "ParsiPay") +set(CN_PROJECT_NAME "parsipay") set(CN_CURRENCY_DISPLAY_NAME "ParsiCoin") set(CN_CURRENCY_TICKER "PARS") -set(CN_VERSION 1.0.3) +set(CN_VERSION 1.0.4) diff --git a/src/Settings.cpp b/src/Settings.cpp index 6c05b25..2dd1f2e 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -63,7 +63,7 @@ void Settings::load() { } if (!m_settings.contains(OPTION_CONNECTION)) { - m_connectionMode = "remote"; + m_connectionMode = "auto"; } if (!m_settings.contains(OPTION_DAEMON_PORT)) { @@ -239,7 +239,7 @@ QString Settings::getConnection() const { connection = m_settings.value(OPTION_CONNECTION).toString(); } else { - connection = "remote"; // default + connection = "auto"; // default } return connection; } diff --git a/src/cryptonotewallet.rc b/src/cryptonotewallet.rc index 8f82376..8fb29d6 100644 --- a/src/cryptonotewallet.rc +++ b/src/cryptonotewallet.rc @@ -2,15 +2,15 @@ IDI_ICON1 ICON "images\parsicoinz.ico" #include -#define VER_FILEVERSION 1,0,3 -#define VER_FILEVERSION_STR "1.0.3\0" -#define VER_PRODUCTVERSION 1,0,3 -#define VER_PRODUCTVERSION_STR "1.0.3\0" -#define VER_FILEDESCRIPTION_STR "ParsiPay" -#define VER_INTERNALNAME_STR "ParsiCoin" +#define VER_FILEVERSION 1,0,4 +#define VER_FILEVERSION_STR "1.0.4\0" +#define VER_PRODUCTVERSION 1,0,4 +#define VER_PRODUCTVERSION_STR "1.0.4\0" +#define VER_FILEDESCRIPTION_STR "parsipay" +#define VER_INTERNALNAME_STR "parsipay" #define VER_LEGALCOPYRIGHT_STR "Copyright (C) 2018, Parsicoin Developers" -#define VER_ORIGINALFILENAME_STR "ParsiPay.exe" -#define VER_PRODUCTNAME_STR "ParsiCoin" +#define VER_ORIGINALFILENAME_STR "parsipay.exe" +#define VER_PRODUCTNAME_STR "parsipay" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/src/gui/PrivateKeysDialog.cpp b/src/gui/PrivateKeysDialog.cpp index 47d1102..3e2663c 100644 --- a/src/gui/PrivateKeysDialog.cpp +++ b/src/gui/PrivateKeysDialog.cpp @@ -32,10 +32,11 @@ void PrivateKeysDialog::walletOpened() { m_ui->m_privateKeyEdit->setText(privateKeys); //m_ui->m_qrLabel->showQRCode(privateKeys); -QString spendSecretKey = QString::fromStdString(Common::podToHex(keys.spendSecretKey)); - QString viewSecretKey = QString::fromStdString(Common::podToHex(keys.viewSecretKey)); - m_ui->m_spendSecretKeyEdit->setText(spendSecretKey); - m_ui->m_viewSecretKeyEdit->setText(viewSecretKey); + QString spendSecretKey = QString::fromStdString(Common::podToHex(keys.spendSecretKey)); + QString viewSecretKey = QString::fromStdString(Common::podToHex(keys.viewSecretKey)); + + m_ui->m_spendSecretKeyEdit->setText(spendSecretKey); + m_ui->m_viewSecretKeyEdit->setText(viewSecretKey); } diff --git a/src/gui/ui/aboutdialog.ui b/src/gui/ui/aboutdialog.ui index 2b65abd..2ac9a07 100644 --- a/src/gui/ui/aboutdialog.ui +++ b/src/gui/ui/aboutdialog.ui @@ -98,7 +98,7 @@ - <html><head/><body><p>ParsiPay (ParsiCoin GUI Wallet) Version 1.0.3</p><p>ParsiCoin is A Private, Untraceable, Anonymous CryptoCurrency Based on CryptoNote</p><p>Copyright (c) 2018. ParsiCoin Developers</p><p><a href="http://opensource.org/licenses/gpl-3.0"><span style=" text-decoration: underline; color:#0000ff;">http://opensource.org/licenses/gpl-3.0</span></a></p><p><a href="Https://ParsiCoin.Net/"><span style=" text-decoration: underline; color:#0000ff;">https://ParsiCoin.Net/</span></a></p></body></html> + <html><head/><body><p>ParsiPay (ParsiCoin GUI Wallet) Version 1.0.4</p><p>ParsiCoin is A Private, Untraceable, Anonymous CryptoCurrency Based on CryptoNote</p><p>Copyright (c) 2018. ParsiCoin Developers</p><p><a href="http://opensource.org/licenses/gpl-3.0"><span style=" text-decoration: underline; color:#0000ff;">http://opensource.org/licenses/gpl-3.0</span></a></p><p><a href="Https://ParsiCoin.Net/"><span style=" text-decoration: underline; color:#0000ff;">https://ParsiCoin.Net/</span></a></p></body></html> Qt::RichText diff --git a/src/gui/ui/privatekeysdialog.ui b/src/gui/ui/privatekeysdialog.ui index e8edd16..6eaf51f 100644 --- a/src/gui/ui/privatekeysdialog.ui +++ b/src/gui/ui/privatekeysdialog.ui @@ -37,7 +37,6 @@ - diff --git a/src/parsicoinwallet.desktop b/src/parsipay.desktop similarity index 97% rename from src/parsicoinwallet.desktop rename to src/parsipay.desktop index e474b58..692638f 100644 --- a/src/parsicoinwallet.desktop +++ b/src/parsipay.desktop @@ -21,4 +21,4 @@ Type=Application Icon=parsicoin MimeType=x-scheme-handler/parsipay; Categories=Office;Finance; -Version=1.0.3 +Version=1.0.4