diff --git a/JChatClient/bin/client b/JChatClient/bin/client index bc75b7d..b22e356 100755 --- a/JChatClient/bin/client +++ b/JChatClient/bin/client diff --git a/JChatServer/bin/pad/prac2/JChat$1.class b/JChatServer/bin/pad/prac2/JChat$1.class index f1f9d1c..e8fef6f 100644 --- a/JChatServer/bin/pad/prac2/JChat$1.class +++ b/JChatServer/bin/pad/prac2/JChat$1.class diff --git a/JChatServer/bin/pad/prac2/JChat.class b/JChatServer/bin/pad/prac2/JChat.class index 6b9e7b3..5c8923a 100644 --- a/JChatServer/bin/pad/prac2/JChat.class +++ b/JChatServer/bin/pad/prac2/JChat.class diff --git a/JChatServer/src/pad/prac2/JChat.java b/JChatServer/src/pad/prac2/JChat.java index 3f3863a..bc269c4 100644 --- a/JChatServer/src/pad/prac2/JChat.java +++ b/JChatServer/src/pad/prac2/JChat.java @@ -6,7 +6,6 @@ public class JChat { public static void main(String[] args) { - String ip; int port, roomSize; Scanner in = new Scanner(System.in); diff --git a/QChatClient/QChatClient.pro b/QChatClient/QChatClient.pro new file mode 100644 index 0000000..8eb6305 --- /dev/null +++ b/QChatClient/QChatClient.pro @@ -0,0 +1,20 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-12-10T14:22:05 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = QChatClient +TEMPLATE = app + + +SOURCES += main.cpp\ + chatwindow.cpp + +HEADERS += chatwindow.h + +FORMS += chatwindow.ui diff --git a/QChatClient/QChatClient.pro.user b/QChatClient/QChatClient.pro.user new file mode 100644 index 0000000..9005d03 --- /dev/null +++ b/QChatClient/QChatClient.pro.user @@ -0,0 +1,256 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {430bae4e-c8d6-488c-936e-c89fd5587cd0} + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop-Debug + true + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop-Release + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + QChatClient + + Qt4ProjectManager.Qt4RunConfiguration:/home/imanol/devel/eclipse/PAD/QChatClient/QChatClient.pro + 2 + + QChatClient.pro + false + false + + + 3768 + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {0fd5067a-d849-4d4e-9457-800baef2de83} + + + ProjectExplorer.Project.Updater.FileVersion + 12 + + diff --git a/QChatClient/chatwindow.cpp b/QChatClient/chatwindow.cpp new file mode 100644 index 0000000..0f9fb06 --- /dev/null +++ b/QChatClient/chatwindow.cpp @@ -0,0 +1,14 @@ +#include "chatwindow.h" +#include "ui_chatwindow.h" + +ChatWindow::ChatWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::ChatWindow) +{ + ui->setupUi(this); +} + +ChatWindow::~ChatWindow() +{ + delete ui; +} diff --git a/QChatClient/chatwindow.h b/QChatClient/chatwindow.h new file mode 100644 index 0000000..3265343 --- /dev/null +++ b/QChatClient/chatwindow.h @@ -0,0 +1,22 @@ +#ifndef CHATWINDOW_H +#define CHATWINDOW_H + +#include + +namespace Ui { +class ChatWindow; +} + +class ChatWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit ChatWindow(QWidget *parent = 0); + ~ChatWindow(); + +private: + Ui::ChatWindow *ui; +}; + +#endif // CHATWINDOW_H diff --git a/QChatClient/chatwindow.ui b/QChatClient/chatwindow.ui new file mode 100644 index 0000000..91d3247 --- /dev/null +++ b/QChatClient/chatwindow.ui @@ -0,0 +1,24 @@ + + ChatWindow + + + + 0 + 0 + 400 + 300 + + + + ChatWindow + + + + + + + + + + + diff --git a/QChatClient/main.cpp b/QChatClient/main.cpp new file mode 100644 index 0000000..ed7054b --- /dev/null +++ b/QChatClient/main.cpp @@ -0,0 +1,11 @@ +#include "chatwindow.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + ChatWindow w; + w.show(); + + return a.exec(); +}