Skip to content
This repository has been archived by the owner on Jan 12, 2020. It is now read-only.

Commit

Permalink
Initial version.
Browse files Browse the repository at this point in the history
  • Loading branch information
BITTORIUM authored and mtl1979 committed Sep 20, 2018
1 parent 0e593a6 commit 40dadbc
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ if (WIN32)

set(PLATFORM_DIR Windows)
set(BUILD_PLATFORM WIN32)
set(BUILD_RESOURCES src/pinkstarcoinwallet.rc)
set(BUILD_RESOURCES src/BittoriumWallet.rc)
set(QTMAIN Qt5::WinMain)

elseif (UNIX)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ If you are building on an older processor without AVX support, add the following

You may find it helpful to explicitly include Boost and QT paths:
```
cmake.exe -D PORTABLE=1 -W no-dev -D BOOST_ROOT=C:\boost_1_59_0 -D BOOST_LIBRARYDIR=C:\boost_1_59_0\libs\ -DC MAKE_PREFIX_PATH=D:\Qt\5.10.0\msvc2015_64 -G "Visual Studio 14 Win64" ..
cmake.exe -DPORTABLE=1 -Wno-dev -D BOOST_ROOT=C:\boost_1_59_0 -D BOOST_LIBRARYDIR=C:\boost_1_59_0\libs\ -D CMAKE_PREFIX_PATH=D:\Qt\5.10.0\msvc2015_64 -G "Visual Studio 14 Win64" ..
```

And then build from within MSVC.
Expand Down
4 changes: 2 additions & 2 deletions src/Application/CommandLineParser.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2015-2018, The Bytecoin developers
// Copyright (c) 2015-2018, The Bytecoin developers
// Copyright (c) 2018, The PinkstarcoinV2 developers
// Copyright (c) 2018, The Bittorium developers
//
Expand Down Expand Up @@ -43,7 +43,7 @@ CommandLineParser::CommandLineParser(QObject* _parent) : QObject(_parent), m_par
m_hideMyPortOption("hide-my-port", tr("Do not announce yourself as peerlist candidate")),
m_dataDirOption("data-dir", tr("Specify data directory"), tr("directory"), QString::fromStdString(Tools::getDefaultDataDirectory())),
m_minimized("minimized", tr("Run application in minimized mode")) {
m_parser.setApplicationDescription(tr("PinkstarcoinV2 wallet"));
m_parser.setApplicationDescription(tr("Bittorium wallet"));
m_parser.addHelpOption();
m_parser.addVersionOption();
m_parser.addOption(m_debugOption);
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/Common/AboutDialog.ui
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialog</class>
<widget class="QDialog" name="AboutDialog">
Expand Down Expand Up @@ -29,7 +29,7 @@
</size>
</property>
<property name="windowTitle">
<string>About PinkstarcoinV2</string>
<string>About Bittorium</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
<item>
Expand Down
15 changes: 5 additions & 10 deletions src/Gui/Common/BlockchainInstaller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void BlockchainInstaller::exec() {
return;
}

if (!checkIfpinkstarcoinBlockchainExists()) {
if (!checkIfBittoriumBlockchainExists()) {
installBlockchain();
return;
}
Expand All @@ -67,7 +67,7 @@ void BlockchainInstaller::exec() {

QString questionStringTemplate = tr("Would you like to replace your current blockchain (height: %1)\nwith the one in your GUI wallet folder (height: %2)?");

QuestionDialog dlg(tr("Blockchain installation"), QString(questionStringTemplate).arg(pinkstarcoinHeight).arg(currentHeight), nullptr);
QuestionDialog dlg(tr("Blockchain installation"), QString(questionStringTemplate).arg(BittoriumHeight).arg(currentHeight), nullptr);
if (dlg.exec() == QDialog::Accepted) {
installBlockchain();
}
Expand All @@ -79,11 +79,6 @@ bool BlockchainInstaller::checkIfCurrentBlockchainExists() const {
return false;
}

QByteArray ethalonGenesisBlock = QByteArray::fromHex(ETHALON_GENESIS_BLOCK_STRING);
if (std::memcmp(ethalonGenesisBlock.data(), genesisBlockData, ethalonGenesisBlock.size())) {
return false;
}

return true;
}

Expand Down Expand Up @@ -121,8 +116,8 @@ bool BlockchainInstaller::getGenesisBlockFromBlockchain(char** _genesisBlockData
return true;
}

bool BlockchainInstaller::checkIfpinkstarcoinBlockchainExists() const {
return m_BittroiumDir.exists() && m_BittoriumDir.exists(m_blocksFileName);
bool BlockchainInstaller::checkIfBittoriumBlockchainExists() const {
return m_BittoriumDir.exists() && m_BittoriumDir.exists(m_blocksFileName);
}

bool BlockchainInstaller::checkIfBlockchainOutdated(quint64& _sourceHeight, quint64& _targetHeight) const {
Expand All @@ -149,7 +144,7 @@ QFileInfo BlockchainInstaller::currentBlockchainInfo() const {
return QFileInfo(m_applicationDir.absoluteFilePath(m_blocksFileName));
}

QFileInfo BlockchainInstaller::pinkstarcoinBlockchainInfo() const {
QFileInfo BlockchainInstaller::BittoriumBlockchainInfo() const {
return QFileInfo(m_BittoriumDir.absoluteFilePath(m_blocksFileName));
}

Expand Down
4 changes: 2 additions & 2 deletions src/Gui/Common/BlockchainInstaller.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class BlockchainInstaller : public QObject {
const QDir m_applicationDir;

bool checkIfCurrentBlockchainExists() const;
bool checkIfpinkstarcoinBlockchainExists() const;
bool checkIfBittoriumBlockchainExists() const;
bool getGenesisBlockFromBlockchain(char** _genesisBlockData) const;
bool checkIfBlockchainOutdated(quint64& _current, quint64& _pinkstarcoin) const;
QFileInfo currentBlockchainInfo() const;
QFileInfo pinkstarcoinBlockchainInfo() const;
QFileInfo BittoriumBlockchainInfo() const;

void copyProgress(quint64 _copied, quint64 _total);
void installBlockchain();
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/Common/ExitWidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>PinkstarcoinV2 wallet is saving data.
<string>Bittorium wallet is saving data.
Please wait...</string>
</property>
</widget>
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/Options/ConnectionOptionsFrame.ui
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<item alignment="Qt::AlignTop">
<widget class="WalletGui::WalletSmallGrayTextLabel" name="m_autoHelperLabel">
<property name="text">
<string>Wallet will connect to local Bittorium daemon process on port 34902. In case of no local daemon running it will use an in-wallet embedded node implementation.</string>
<string>Wallet will connect to local Bittorium daemon process on port 34916. In case of no local daemon running it will use an in-wallet embedded node implementation.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
Expand Down
Binary file removed src/images/splash.jpg
Binary file not shown.
Binary file added src/images/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 40dadbc

Please sign in to comment.