Skip to content

Commit

Permalink
LuKa v1.3 - Phoenix
Browse files Browse the repository at this point in the history
  • Loading branch information
Arielony committed Jul 2, 2018
1 parent 7115a04 commit ebc9949
Show file tree
Hide file tree
Showing 18 changed files with 10 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/Application/WalletApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace WalletGui {

namespace {

const char BYTECOIN_URI_SCHEME_NAME[] = "intensecoin";
const char LUKA_URI_SCHEME_NAME[] = "cryptoluka";
const QRegularExpression LOG_SPLASH_REG_EXP("\\[Core\\] Imported block with index");

quint16 findPort() {
Expand Down Expand Up @@ -143,7 +143,7 @@ bool WalletApplication::init() {
WalletLogger::info(tr("[Application] Initializing..."));
m_lockFile = new QLockFile(Settings::instance().getDataDir().absoluteFilePath("lukacoinwallet.lock"));
QUrl paymentUrl = QUrl::fromUserInput(arguments().last());
if (paymentUrl.scheme() != BYTECOIN_URI_SCHEME_NAME) {
if (paymentUrl.scheme() != LUKA_URI_SCHEME_NAME) {
paymentUrl = QUrl();
}

Expand Down Expand Up @@ -241,7 +241,7 @@ bool WalletApplication::initCryptoNoteAdapter() {
for (;;) {
if (m_splash != nullptr) {
m_splash->show();
m_splash->showMessage(QObject::tr("Loading blockchain..."), Qt::AlignLeft | Qt::AlignBottom, Qt::white);
m_splash->showMessage(QObject::tr("v1.3 - Loading blockchain..."), Qt::AlignLeft | Qt::AlignBottom, Qt::white);
if (m_logWatcher == nullptr) {
m_logWatcher = new LogFileWatcher(Settings::instance().getDataDir().absoluteFilePath(CORE_LOG_FILE_NAME), this);
connect(m_logWatcher, &LogFileWatcher::newLogStringSignal, this, &WalletApplication::newLogString);
Expand All @@ -265,7 +265,7 @@ bool WalletApplication::initCryptoNoteAdapter() {
dlg.setText(QObject::tr("The database is currently used by another application or service.\n"
"If you have lukad with non-default RPC port, you should terminate it and relaunch LuKaWallet\n"
"or\n"
"Set the Local deamon required port in LuKaWallet Menu/Preferences/Connection settings."));
"Set the Local daemon required port in LuKaWallet Menu/Preferences/Connection settings."));
if (m_splash != nullptr)
m_splash->hide();
dlg.exec();
Expand Down
2 changes: 2 additions & 0 deletions src/Gui/MainWindow/ui_MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,10 @@ class Ui_MainWindow
menuHelp = new QMenu(menubar);
menuHelp->setObjectName(QStringLiteral("menuHelp"));
MainWindow->setMenuBar(menubar);

statusBar = new WalletGui::WalletStatusBar(MainWindow);
statusBar->setObjectName(QStringLiteral("statusBar"));

MainWindow->setStatusBar(statusBar);

menubar->addAction(menuFile->menuAction());
Expand Down
7 changes: 4 additions & 3 deletions src/Settings/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ const quint64 DEFAULT_OPTIMIZATION_PERIOD = 1000 * 60 * 30; // 30 minutes
const quint64 DEFAULT_OPTIMIZATION_THRESHOLD = 10000000000000;
const quint64 DEFAULT_OPTIMIZATION_MIXIN = 0;

const char* VERSION_NAME = "Phoenix";
const quint64 VERSION_MAJOR = 1;
const quint64 VERSION_MINOR = 2;
const quint64 VERSION_MINOR = 3;
const quint64 VERSION_PATCH = 0;

}
Expand All @@ -82,7 +83,7 @@ Settings& Settings::instance() {


Settings::Settings() : m_p2pBindPort(0), m_cmdLineParser(nullptr) {
m_defaultPoolList << "stratum01.cryptoluka.cl:9992";
m_defaultPoolList << "stratum01.cryptoluka.cl:9991";

Style* lightStyle = new LightStyle();
Style* darkStyle = new DarkStyle();
Expand Down Expand Up @@ -428,7 +429,7 @@ bool Settings::isEncrypted() const {

QString Settings::getVersion() const {
QReadLocker lock(&m_lock);
return QString("%1.%2.%3").arg(VERSION_MAJOR).arg(VERSION_MINOR).arg(VERSION_PATCH);
return QString("%1.%2.%3 - %4").arg(VERSION_MAJOR).arg(VERSION_MINOR).arg(VERSION_PATCH).arg(VERSION_NAME);
}

QString Settings::getCurrentTheme() const {
Expand Down
Binary file modified src/icons/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/icons/logo_bl.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/1_2_Sigma/cryptonote.icns
Binary file not shown.
Binary file added src/images/1_2_Sigma/cryptonote.ico
Binary file not shown.
Binary file added src/images/1_2_Sigma/cryptonote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/1_2_Sigma/intensecoin.icns
Binary file not shown.
Binary file added src/images/1_2_Sigma/intensecoin.ico
Binary file not shown.
Binary file added src/images/1_2_Sigma/intensecoin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/1_3_Phoenix/cryptonote.icns
Binary file not shown.
Binary file added src/images/1_3_Phoenix/cryptonote.ico
Binary file not shown.
Binary file added src/images/1_3_Phoenix/cryptonote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/1_3_Phoenix/intensecoin.icns
Binary file not shown.
Binary file added src/images/1_3_Phoenix/intensecoin.ico
Binary file not shown.
Binary file added src/images/1_3_Phoenix/intensecoin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/splash.png
100755 → 100644
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 ebc9949

Please sign in to comment.