Skip to content

S
skylivex
Commit 0172fe95 authored by Stefy Lanza (nextime / spora )'s avatar Stefy Lanza (nextime / spora )
Browse files
Options

fix compilation issues

parent 68798f4f
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 36 deletions
gui/maingui.html
View file @ 0172fe95
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
overflow:hidden; overflow:hidden;
} }
#top { #top {
height:50px; height:40px;
border: 1px solid #000000; border: 1px solid #000000;
width:auto; width:auto;
position: absolute; position: absolute;
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#left { #left {
width: 330px; width: 330px;
position: absolute; position: absolute;
top:58px; top:48px;
left: 8px; left: 8px;
right: 8px; right: 8px;
bottom: 8px; bottom: 8px;
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
#right { #right {
position: absolute; position: absolute;
top: 58px; top: 48px;
left: 338px; left: 338px;
right: 8px; right: 8px;
bottom: 8px; bottom: 8px;
...@@ -56,9 +56,18 @@ ...@@ -56,9 +56,18 @@
position: absolute; position: absolute;
bottom: 70px; bottom: 70px;
top: 0px; top: 0px;
right: 0px; right: 130px;
left: 0px; left: 0px;
} }
#chatlist {
overflow-y: auto;
width: 130px;
position: absolute;
border: 1px solid #00FF00;
bottom: 70px;
top: 0px;
right: 0px;
}
#chatinput { #chatinput {
position: absolute; position: absolute;
height: 70px; height: 70px;
...@@ -83,36 +92,38 @@ ...@@ -83,36 +92,38 @@
</div> </div>
</div> </div>
<div id="right"> <div id="right">
<div id="chatwrapperarea"> <div id="chatarea">
<div id="chatarea"> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>CHAT</p>
<p>CHAT</p> <p>PIPPO</p>
<p>PIPPO</p> </div>
</div> <div id="chatlist">
<p>user1</p>
<p>user2</p>
</div> </div>
<div id="chatinput"> <div id="chatinput">
<p>INPUT</p> <p>INPUT</p>
......
plugins/skproto.cpp
View file @ 0172fe95
...@@ -51,7 +51,7 @@ void SkyliveProtocol::startPlugin() ...@@ -51,7 +51,7 @@ void SkyliveProtocol::startPlugin()
pktTimer = new QTimer(); pktTimer = new QTimer();
QObject::connect(pktTimer, SIGNAL(timeout()), this, SLOT(processPackets())); QObject::connect(pktTimer, SIGNAL(timeout()), this, SLOT(processPackets()));
pktTimer->start(); //pktTimer->start();
} }
...@@ -306,6 +306,8 @@ void SkyliveProtocol::handle_connect(SKMessage msg) ...@@ -306,6 +306,8 @@ void SkyliveProtocol::handle_connect(SKMessage msg)
connect(tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)),this, SLOT(displayError(QAbstractSocket::SocketError))); connect(tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)),this, SLOT(displayError(QAbstractSocket::SocketError)));
tcpSocket->abort(); tcpSocket->abort();
tcpSocket->connectToHost(SERVERHOST, SERVERPORT); tcpSocket->connectToHost(SERVERHOST, SERVERPORT);
} }
void SkyliveProtocol::handle_putlogin(SKMessage msg) void SkyliveProtocol::handle_putlogin(SKMessage msg)
......
plugins/skproto.h
View file @ 0172fe95
...@@ -114,7 +114,7 @@ class SkyliveProtocol : public QObject, SkylivexPluginInterface ...@@ -114,7 +114,7 @@ class SkyliveProtocol : public QObject, SkylivexPluginInterface
void sendPacket(QString &cmd, QList<QString> &paramlist); void sendPacket(QString &cmd, QList<QString> &paramlist);
private slots: private slots:
void sessionOpened(); //void sessionOpened();
void readFromNetwork(); void readFromNetwork();
void clientConnected(); void clientConnected();
void displayError(QAbstractSocket::SocketError); void displayError(QAbstractSocket::SocketError);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment