Skip to content

Commit

Permalink
Chat Incorporated , Checkpointed , Important Links Drop Down Menu Add…
Browse files Browse the repository at this point in the history
…ed , UI Improvements , Anon Base Implemented.
  • Loading branch information
sherlockcoin committed Sep 29, 2014
1 parent a965cd3 commit 4d1d0d4
Show file tree
Hide file tree
Showing 74 changed files with 2,189 additions and 235 deletions.
5 changes: 5 additions & 0 deletions NavajoCoin-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CONFIG += no_include_pwd
CONFIG += thread
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
lessThan(QT_MAJOR_VERSION, 5): CONFIG += static
QT += network
QMAKE_CXXFLAGS = -fpermissive

greaterThan(QT_MAJOR_VERSION, 4) {
Expand Down Expand Up @@ -247,6 +248,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/walletmodel.h \
src/bitcoinrpc.h \
src/qt/overviewpage.h \
src/qt/ChatWindow.h \
src/qt/csvmodelwriter.h \
src/crypter.h \
src/qt/sendcoinsentry.h \
Expand Down Expand Up @@ -335,6 +337,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/rpcblockchain.cpp \
src/rpcrawtransaction.cpp \
src/qt/overviewpage.cpp \
src/qt/ChatWindow.cxx \
src/qt/csvmodelwriter.cpp \
src/crypter.cpp \
src/qt/sendcoinsentry.cpp \
Expand All @@ -356,6 +359,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \

RESOURCES += \
src/qt/bitcoin.qrc
src/qt/images.qrc

FORMS += \
src/qt/forms/coincontroldialog.ui \
Expand All @@ -366,6 +370,7 @@ FORMS += \
src/qt/forms/editaddressdialog.ui \
src/qt/forms/transactiondescdialog.ui \
src/qt/forms/overviewpage.ui \
src/qt/forms/ChatWindow.ui \
src/qt/forms/sendcoinsentry.ui \
src/qt/forms/askpassphrasedialog.ui \
src/qt/forms/rpcconsole.ui \
Expand Down
1 change: 1 addition & 0 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ namespace Checkpoints
( 221000, CheckBlock33 )
( 222000, CheckBlock34 )
( 224176, CheckBlock35 )
( 419892, CheckBlock36 )
;

// TestNet has no checkpoints
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 0

// Converts the parameter X to a string after macro replacement on X has been performed.
Expand Down
1 change: 1 addition & 0 deletions src/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ static const uint256 CheckBlock32 ("42d8c73e295bc58f0d6457739f751c6fdb7b066fc274
static const uint256 CheckBlock33 ("4b3a964cb7daefed14cef75dcd1728fb5e45d121abe60a24fae241b4cc75fa57"); // Checkpoint at block 221000
static const uint256 CheckBlock34 ("75da191e75dd985446d4e0dc28211711ec055a38e8a9fb6491c83190b1bdfd1a"); // Checkpoint at block 222000
static const uint256 CheckBlock35 ("eb8c232317e6a2f76a8358bf917076c40b5f9a70fb3de34f1e2b17605d24b879"); // Checkpoint at block 224176
static const uint256 CheckBlock36 ("856573b88e592d4eb4eb75d690e80bd7ce179d9da1cf6a185495385bb57901c4"); // Checkpoint at block 419892

inline int64_t PastDrift(int64_t nTime) { return nTime - 24 * 60 * 60; } // up to 1 day from the past
inline int64_t FutureDrift(int64_t nTime) { return nTime + 24 * 60 * 60; } // up to 1 day from the future
Expand Down
68 changes: 68 additions & 0 deletions src/qt/ChatWindow.cxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#include "ChatWindow.h"

#include <QRegExp>

ChatWindow::ChatWindow(QWidget *parent) : QMainWindow(parent)
{
setupUi(this);

stackedWidget->setCurrentWidget(loginPage);

socket = new QTcpSocket(this);

connect(socket, SIGNAL(readyRead()), this, SLOT(readyRead()));
connect(socket, SIGNAL(connected()), this, SLOT(connected()));
}

void ChatWindow::on_loginButton_clicked()
{
socket->connectToHost(serverLineEdit->text(), 4200);
}

void ChatWindow::on_sayButton_clicked()
{
QString message = sayLineEdit->text().trimmed();

if(!message.isEmpty())
{
socket->write(QString(message + "\n").toUtf8());
}

sayLineEdit->clear();

sayLineEdit->setFocus();
}

void ChatWindow::readyRead()
{
while(socket->canReadLine())
{
QString line = QString::fromUtf8(socket->readLine()).trimmed();

QRegExp messageRegex("^([^:]+):(.*)$");

QRegExp usersRegex("^/users:(.*)$");

if(usersRegex.indexIn(line) != -1)
{
QStringList users = usersRegex.cap(1).split(",");
userListWidget->clear();
foreach(QString user, users)
new QListWidgetItem(QPixmap(":/res/icons/user.png"), user, userListWidget);
}
else if(messageRegex.indexIn(line) != -1)
{
QString user = messageRegex.cap(1);
QString message = messageRegex.cap(2);

roomTextEdit->append("<b>" + user + "</b>: " + message);
}
}
}

void ChatWindow::connected()
{
stackedWidget->setCurrentWidget(chatPage);

socket->write(QString("/me:" + userLineEdit->text() + "\n").toUtf8());
}
27 changes: 27 additions & 0 deletions src/qt/ChatWindow.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#include <QMainWindow>
#include <QTcpSocket>

#include "ui_ChatWindow.h"

class ChatWindow : public QMainWindow, public Ui::ChatWindow
{
Q_OBJECT

public:

ChatWindow(QWidget *parent=0);

private slots:

void on_loginButton_clicked();

void on_sayButton_clicked();

void readyRead();

void connected();

private:

QTcpSocket *socket;
};
38 changes: 27 additions & 11 deletions src/qt/bitcoin.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,19 @@
<file alias="debugwindow">res/icons/debugwindow.png</file>
<file alias="staking_off">res/icons/staking_off.png</file>
<file alias="staking_on">res/icons/staking_on.png</file>
<file alias="user">res/icons/user.png</file>
<file alias="bitcoin">res/icons/bitcoin.png</file>
<file alias="bitcoin_testnet">res/icons/bitcoin_testnet.png</file>
<file alias="toolbar">res/icons/toolbar.png</file>
<file alias="toolbar_testnet">res/icons/toolbar_testnet.png</file>
<file alias="smiley-button">res/icons/smiley-button.png</file>
<file alias="smiley-button">res/icons/smiley-button.png</file>
<file alias="chat-bubble">res/icons/chat-bubble.png</file>
<file alias="chat-translate">res/icons/chat-translate.png</file>
<file alias="flag_en">res/icons/flags/flag_en.png</file>
<file alias="flag_de">res/icons/flags/flag_de.png</file>
<file alias="flag_fr">res/icons/flags/flag_fr.png</file>
<file alias="flag_es">res/icons/flags/flag_es.png</file>
<file alias="flag_it">res/icons/flags/flag_it.png</file>
<file alias="flag_pt">res/icons/flags/flag_pt.png</file>
<file alias="flag_tr">res/icons/flags/flag_tr.png</file>
<file alias="flag_ru">res/icons/flags/flag_ru.png</file>
<file alias="flag_cn">res/icons/flags/flag_cn.png</file>
<file alias="flag_jp">res/icons/flags/flag_jp.png</file>
<file alias="flag_kr">res/icons/flags/flag_kr.png</file>
<file alias="chat">res/icons/chat.png</file>
</qresource>
<qresource prefix="/smileys">
<qresource prefix="/smileys">
<file alias="icon_smile">res/icons/smileys/icon_smile.png</file>
<file alias="icon_biggrin">res/icons/smileys/icon_biggrin.png</file>
<file alias="icon_sad">res/icons/smileys/icon_sad.png</file>
Expand All @@ -76,6 +69,29 @@
<file alias="splash">res/images/splash.png</file>
<file alias="Wallet_Logo">res/images/Wallet_Logo.png</file>
<file alias="background">res/images/background.jpg</file>
<file alias="p2p">res/images/p2p.png</file>
<file alias="chatback">res/images/chatback.jpg</file>
<file>res/images/nav-bg.jpg</file>
</qresource>
<qresource prefix="/images2">
<file alias="1">res/images/images2/1.jpg</file>
<file alias="2">res/images/images2/2.jpg</file>
<file alias="3">res/images/images2/3.jpg</file>
<file alias="4">res/images/images2/4.jpg</file>
<file alias="5">res/images/images2/5.jpg</file>
<file alias="6">res/images/images2/6.jpg</file>
<file alias="7">res/images/images2/7.jpg</file>
<file alias="8">res/images/images2/8.jpg</file>
<file alias="9">res/images/images2/9.jpg</file>
<file alias="10">res/images/images2/10.jpg</file>
<file alias="11">res/images/images2/11.jpg</file>
<file alias="12">res/images/images2/12.jpg</file>
<file alias="13">res/images/images2/13.jpg</file>
<file alias="coins">res/images/images2/coins.jpg</file>
<file alias="coins2">res/images/images2/coins2.jpg</file>
<file alias="moh">res/images/images2/Medal_of_Honor.jpg</file>
<file alias="navajo">res/images/images2/navajo.jpg</file>
<file alias="patterns">res/images/images2/patterns.jpg</file>
</qresource>
<qresource prefix="/movies">
<file alias="update_spinner">res/movies/update_spinner.mng</file>
Expand Down
Loading

0 comments on commit 4d1d0d4

Please sign in to comment.