Commit 6c1aa7191d49f786340d38f3cb12c7eb3ddd7400

Authored by Imanol-Mikel Barba Sabariego
1 parent e2736cfe

git-svn-id: svn://imanolbarba.net/PAD@35 c2ee353e-ed0d-4329-bf56-03aec153487f

JChatServer/src/pad/prac2/JChat.java
@@ -22,8 +22,8 @@ public class JChat @@ -22,8 +22,8 @@ public class JChat
22 public void run() 22 public void run()
23 { 23 {
24 System.out.println("JChat: Caught interrupt, killing server..."); 24 System.out.println("JChat: Caught interrupt, killing server...");
25 - serv.killServer();  
26 - } 25 + serv.killServer();
  26 + }
27 }); 27 });
28 serv.startServer(); 28 serv.startServer();
29 } 29 }
QChatClient/QChatClient.pro.user
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject> 2 <!DOCTYPE QtCreatorProject>
3 -<!-- Written by QtCreator 2.7.1, 2013-12-12T01:17:13. --> 3 +<!-- Written by QtCreator 2.7.0, 2013-12-12T02:20:40. -->
4 <qtcreator> 4 <qtcreator>
5 <data> 5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable> 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> 15 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
16 <value type="QByteArray" key="language">Cpp</value> 16 <value type="QByteArray" key="language">Cpp</value>
17 <valuemap type="QVariantMap" key="value"> 17 <valuemap type="QVariantMap" key="value">
18 - <value type="QString" key="CurrentPreferences">qt2</value> 18 + <value type="QString" key="CurrentPreferences">CppGlobal</value>
19 </valuemap> 19 </valuemap>
20 </valuemap> 20 </valuemap>
21 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> 21 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <valuemap type="QVariantMap"> 53 <valuemap type="QVariantMap">
54 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> 54 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
55 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> 55 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
56 - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{430bae4e-c8d6-488c-936e-c89fd5587cd0}</value> 56 + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{d6a12d1a-dee4-4341-8f4f-e2749eba145e}</value>
57 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> 57 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
58 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> 58 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
59 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> 59 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -189,7 +189,6 @@ @@ -189,7 +189,6 @@
189 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> 189 <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
190 </valuemap> 190 </valuemap>
191 <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> 191 <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
192 - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>  
193 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> 192 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
194 <value type="bool" key="Analyzer.Project.UseGlobal">true</value> 193 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
195 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> 194 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
@@ -247,7 +246,7 @@ @@ -247,7 +246,7 @@
247 </data> 246 </data>
248 <data> 247 <data>
249 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> 248 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
250 - <value type="QString">{0fd5067a-d849-4d4e-9457-800baef2de83}</value> 249 + <value type="QString">{fd24a9a9-cdbc-49b3-845c-b174fda2a7ac}</value>
251 </data> 250 </data>
252 <data> 251 <data>
253 <variable>ProjectExplorer.Project.Updater.FileVersion</variable> 252 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
QChatClient/chatwindow.cpp
1 #include "chatwindow.h" 1 #include "chatwindow.h"
2 #include "ui_chatwindow.h" 2 #include "ui_chatwindow.h"
3 3
  4 +using namespace std;
  5 +
4 ChatWindow::ChatWindow(QWidget *parent) : 6 ChatWindow::ChatWindow(QWidget *parent) :
5 QMainWindow(parent), 7 QMainWindow(parent),
6 ui(new Ui::ChatWindow) 8 ui(new Ui::ChatWindow)
QChatClient/chatwindow.ui
@@ -24,110 +24,55 @@ @@ -24,110 +24,55 @@
24 </sizepolicy> 24 </sizepolicy>
25 </property> 25 </property>
26 <layout class="QGridLayout" name="gridLayout"> 26 <layout class="QGridLayout" name="gridLayout">
27 - <item row="2" column="1">  
28 - <spacer name="verticalSpacer">  
29 - <property name="orientation">  
30 - <enum>Qt::Vertical</enum>  
31 - </property>  
32 - <property name="sizeType">  
33 - <enum>QSizePolicy::Fixed</enum>  
34 - </property>  
35 - <property name="sizeHint" stdset="0">  
36 - <size>  
37 - <width>20</width>  
38 - <height>5</height>  
39 - </size>  
40 - </property>  
41 - </spacer>  
42 - </item>  
43 - <item row="1" column="1">  
44 - <widget class="QTextBrowser" name="chatText"/>  
45 - </item>  
46 - <item row="0" column="1">  
47 - <spacer name="verticalSpacer_2">  
48 - <property name="orientation">  
49 - <enum>Qt::Vertical</enum>  
50 - </property>  
51 - <property name="sizeType">  
52 - <enum>QSizePolicy::Fixed</enum>  
53 - </property>  
54 - <property name="sizeHint" stdset="0">  
55 - <size>  
56 - <width>20</width>  
57 - <height>5</height>  
58 - </size>  
59 - </property>  
60 - </spacer>  
61 - </item>  
62 - <item row="1" column="2">  
63 - <spacer name="horizontalSpacer_2">  
64 - <property name="orientation">  
65 - <enum>Qt::Horizontal</enum>  
66 - </property>  
67 - <property name="sizeType">  
68 - <enum>QSizePolicy::Fixed</enum>  
69 - </property>  
70 - <property name="sizeHint" stdset="0">  
71 - <size>  
72 - <width>10</width>  
73 - <height>20</height>  
74 - </size>  
75 - </property>  
76 - </spacer>  
77 - </item>  
78 - <item row="3" column="1">  
79 - <widget class="QTextEdit" name="inputText">  
80 - <property name="sizePolicy">  
81 - <sizepolicy hsizetype="Expanding" vsizetype="Fixed">  
82 - <horstretch>0</horstretch>  
83 - <verstretch>0</verstretch>  
84 - </sizepolicy>  
85 - </property>  
86 - <property name="minimumSize">  
87 - <size>  
88 - <width>0</width>  
89 - <height>100</height>  
90 - </size>  
91 - </property>  
92 - <property name="maximumSize">  
93 - <size>  
94 - <width>16777215</width>  
95 - <height>100</height>  
96 - </size>  
97 - </property>  
98 - </widget>  
99 - </item>  
100 <item row="1" column="0"> 27 <item row="1" column="0">
101 - <spacer name="horizontalSpacer">  
102 - <property name="orientation">  
103 - <enum>Qt::Horizontal</enum>  
104 - </property>  
105 - <property name="sizeType">  
106 - <enum>QSizePolicy::Fixed</enum>  
107 - </property>  
108 - <property name="sizeHint" stdset="0">  
109 - <size>  
110 - <width>10</width>  
111 - <height>20</height>  
112 - </size>  
113 - </property>  
114 - </spacer>  
115 - </item>  
116 - <item row="4" column="1">  
117 - <spacer name="verticalSpacer_3">  
118 - <property name="orientation">  
119 - <enum>Qt::Vertical</enum>  
120 - </property>  
121 - <property name="sizeType">  
122 - <enum>QSizePolicy::Fixed</enum>  
123 - </property>  
124 - <property name="sizeHint" stdset="0">  
125 - <size>  
126 - <width>20</width>  
127 - <height>5</height>  
128 - </size>  
129 - </property>  
130 - </spacer> 28 + <widget class="QWidget" name="widget" native="true">
  29 + <layout class="QGridLayout" name="gridLayout_2">
  30 + <item row="0" column="0">
  31 + <widget class="QSplitter" name="splitter">
  32 + <property name="orientation">
  33 + <enum>Qt::Vertical</enum>
  34 + </property>
  35 + <widget class="QTextBrowser" name="chatText">
  36 + <property name="sizePolicy">
  37 + <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
  38 + <horstretch>0</horstretch>
  39 + <verstretch>0</verstretch>
  40 + </sizepolicy>
  41 + </property>
  42 + </widget>
  43 + <widget class="QTextEdit" name="inputText">
  44 + <property name="enabled">
  45 + <bool>true</bool>
  46 + </property>
  47 + <property name="sizePolicy">
  48 + <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
  49 + <horstretch>0</horstretch>
  50 + <verstretch>0</verstretch>
  51 + </sizepolicy>
  52 + </property>
  53 + <property name="minimumSize">
  54 + <size>
  55 + <width>0</width>
  56 + <height>0</height>
  57 + </size>
  58 + </property>
  59 + <property name="maximumSize">
  60 + <size>
  61 + <width>16777215</width>
  62 + <height>16777215</height>
  63 + </size>
  64 + </property>
  65 + <property name="baseSize">
  66 + <size>
  67 + <width>0</width>
  68 + <height>0</height>
  69 + </size>
  70 + </property>
  71 + </widget>
  72 + </widget>
  73 + </item>
  74 + </layout>
  75 + </widget>
131 </item> 76 </item>
132 </layout> 77 </layout>
133 </widget> 78 </widget>
QChatClient/main.cpp
1 #include "loginscreen.h" 1 #include "loginscreen.h"
2 #include "chatroom.h" 2 #include "chatroom.h"
  3 +#include "chatwindow.h"
3 #include <QApplication> 4 #include <QApplication>
4 5
5 int main(int argc, char *argv[]) 6 int main(int argc, char *argv[])
6 { 7 {
7 QApplication a(argc, argv); 8 QApplication a(argc, argv);
8 - Chatroom l; 9 + ChatWindow l;
9 l.show(); 10 l.show();
10 11
11 return a.exec(); 12 return a.exec();
build-QChatClient-Desktop-Debug/Makefile
1 ############################################################################# 1 #############################################################################
2 # Makefile for building: QChatClient 2 # Makefile for building: QChatClient
3 -# Generated by qmake (3.0) (Qt 5.0.2) on: miรฉ dic 11 19:16:50 2013 3 +# Generated by qmake (3.0) (Qt 5.0.1) on: jue dic 12 02:20:27 2013
4 # Project: ../QChatClient/QChatClient.pro 4 # Project: ../QChatClient/QChatClient.pro
5 # Template: app 5 # Template: app
6 # Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro 6 # Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro
@@ -84,8 +84,14 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ @@ -84,8 +84,14 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \
84 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ 84 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \
85 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ 85 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \
86 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ 86 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \
  87 + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \
  88 + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \
  89 + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \
  90 + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \
  91 + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \
87 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ 92 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \
88 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ 93 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \
  94 + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \
89 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ 95 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \
90 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ 96 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \
91 /usr/share/qt5/mkspecs/features/qt_functions.prf \ 97 /usr/share/qt5/mkspecs/features/qt_functions.prf \
@@ -95,8 +101,9 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ @@ -95,8 +101,9 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \
95 /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ 101 /usr/share/qt5/mkspecs/features/exclusive_builds.prf \
96 /usr/share/qt5/mkspecs/features/default_pre.prf \ 102 /usr/share/qt5/mkspecs/features/default_pre.prf \
97 /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ 103 /usr/share/qt5/mkspecs/features/unix/default_pre.prf \
98 - /usr/share/qt5/mkspecs/features/resolve_config.prf \ 104 + /usr/share/qt5/mkspecs/features/debug.prf \
99 /usr/share/qt5/mkspecs/features/default_post.prf \ 105 /usr/share/qt5/mkspecs/features/default_post.prf \
  106 + /usr/share/qt5/mkspecs/features/shared.prf \
100 /usr/share/qt5/mkspecs/features/qml_debug.prf \ 107 /usr/share/qt5/mkspecs/features/qml_debug.prf \
101 /usr/share/qt5/mkspecs/features/declarative_debug.prf \ 108 /usr/share/qt5/mkspecs/features/declarative_debug.prf \
102 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ 109 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
@@ -165,8 +172,14 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma @@ -165,8 +172,14 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma
165 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ 172 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \
166 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ 173 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \
167 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ 174 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \
  175 + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \
  176 + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \
  177 + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \
  178 + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \
  179 + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \
168 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ 180 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \
169 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ 181 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \
  182 + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \
170 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ 183 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \
171 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ 184 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \
172 /usr/share/qt5/mkspecs/features/qt_functions.prf \ 185 /usr/share/qt5/mkspecs/features/qt_functions.prf \
@@ -176,8 +189,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma @@ -176,8 +189,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma
176 /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ 189 /usr/share/qt5/mkspecs/features/exclusive_builds.prf \
177 /usr/share/qt5/mkspecs/features/default_pre.prf \ 190 /usr/share/qt5/mkspecs/features/default_pre.prf \
178 /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ 191 /usr/share/qt5/mkspecs/features/unix/default_pre.prf \
179 - /usr/share/qt5/mkspecs/features/resolve_config.prf \ 192 + /usr/share/qt5/mkspecs/features/debug.prf \
180 /usr/share/qt5/mkspecs/features/default_post.prf \ 193 /usr/share/qt5/mkspecs/features/default_post.prf \
  194 + /usr/share/qt5/mkspecs/features/shared.prf \
181 /usr/share/qt5/mkspecs/features/qml_debug.prf \ 195 /usr/share/qt5/mkspecs/features/qml_debug.prf \
182 /usr/share/qt5/mkspecs/features/declarative_debug.prf \ 196 /usr/share/qt5/mkspecs/features/declarative_debug.prf \
183 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ 197 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
@@ -216,8 +230,14 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma @@ -216,8 +230,14 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma
216 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri: 230 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri:
217 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri: 231 /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri:
218 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri: 232 /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri:
  233 +/usr/share/qt5/mkspecs/modules/qt_lib_qml.pri:
  234 +/usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri:
  235 +/usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri:
  236 +/usr/share/qt5/mkspecs/modules/qt_lib_quick.pri:
  237 +/usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri:
219 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: 238 /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri:
220 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: 239 /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri:
  240 +/usr/share/qt5/mkspecs/modules/qt_lib_v8.pri:
221 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: 241 /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri:
222 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: 242 /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri:
223 /usr/share/qt5/mkspecs/features/qt_functions.prf: 243 /usr/share/qt5/mkspecs/features/qt_functions.prf:
@@ -227,8 +247,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma @@ -227,8 +247,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma
227 /usr/share/qt5/mkspecs/features/exclusive_builds.prf: 247 /usr/share/qt5/mkspecs/features/exclusive_builds.prf:
228 /usr/share/qt5/mkspecs/features/default_pre.prf: 248 /usr/share/qt5/mkspecs/features/default_pre.prf:
229 /usr/share/qt5/mkspecs/features/unix/default_pre.prf: 249 /usr/share/qt5/mkspecs/features/unix/default_pre.prf:
230 -/usr/share/qt5/mkspecs/features/resolve_config.prf: 250 +/usr/share/qt5/mkspecs/features/debug.prf:
231 /usr/share/qt5/mkspecs/features/default_post.prf: 251 /usr/share/qt5/mkspecs/features/default_post.prf:
  252 +/usr/share/qt5/mkspecs/features/shared.prf:
232 /usr/share/qt5/mkspecs/features/qml_debug.prf: 253 /usr/share/qt5/mkspecs/features/qml_debug.prf:
233 /usr/share/qt5/mkspecs/features/declarative_debug.prf: 254 /usr/share/qt5/mkspecs/features/declarative_debug.prf:
234 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: 255 /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf:
@@ -254,7 +275,7 @@ qmake: FORCE @@ -254,7 +275,7 @@ qmake: FORCE
254 qmake_all: FORCE 275 qmake_all: FORCE
255 276
256 dist: 277 dist:
257 - @test -d .tmp/QChatClient1.0.0 || mkdir -p .tmp/QChatClient1.0.0 278 + @test -d .tmp/QChatClient1.0.0 || $(MKDIR) .tmp/QChatClient1.0.0
258 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.h ../QChatClient/loginscreen.h ../QChatClient/chatroomselect.h ../QChatClient/chatroom.h ../QChatClient/SocketException.h ../QChatClient/Socket.h ../QChatClient/client.h .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/main.cpp ../QChatClient/chatwindow.cpp ../QChatClient/loginscreen.cpp ../QChatClient/chatroomselect.cpp ../QChatClient/chatroom.cpp ../QChatClient/Socket.cpp ../QChatClient/client.cpp .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.ui ../QChatClient/loginscreen.ui ../QChatClient/chatroomselect.ui ../QChatClient/chatroom.ui .tmp/QChatClient1.0.0/ && (cd `dirname .tmp/QChatClient1.0.0` && $(TAR) QChatClient1.0.0.tar QChatClient1.0.0 && $(COMPRESS) QChatClient1.0.0.tar) && $(MOVE) `dirname .tmp/QChatClient1.0.0`/QChatClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/QChatClient1.0.0 279 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.h ../QChatClient/loginscreen.h ../QChatClient/chatroomselect.h ../QChatClient/chatroom.h ../QChatClient/SocketException.h ../QChatClient/Socket.h ../QChatClient/client.h .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/main.cpp ../QChatClient/chatwindow.cpp ../QChatClient/loginscreen.cpp ../QChatClient/chatroomselect.cpp ../QChatClient/chatroom.cpp ../QChatClient/Socket.cpp ../QChatClient/client.cpp .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.ui ../QChatClient/loginscreen.ui ../QChatClient/chatroomselect.ui ../QChatClient/chatroom.ui .tmp/QChatClient1.0.0/ && (cd `dirname .tmp/QChatClient1.0.0` && $(TAR) QChatClient1.0.0.tar QChatClient1.0.0 && $(COMPRESS) QChatClient1.0.0.tar) && $(MOVE) `dirname .tmp/QChatClient1.0.0`/QChatClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/QChatClient1.0.0
259 280
260 281
@@ -318,7 +339,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ @@ -318,7 +339,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
318 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 339 /usr/include/qt5/QtCore/qoldbasicatomic.h \
319 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 340 /usr/include/qt5/QtCore/qatomic_vxworks.h \
320 /usr/include/qt5/QtCore/qatomic_power.h \ 341 /usr/include/qt5/QtCore/qatomic_power.h \
321 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
322 /usr/include/qt5/QtCore/qatomic_alpha.h \ 342 /usr/include/qt5/QtCore/qatomic_alpha.h \
323 /usr/include/qt5/QtCore/qatomic_armv7.h \ 343 /usr/include/qt5/QtCore/qatomic_armv7.h \
324 /usr/include/qt5/QtCore/qatomic_armv6.h \ 344 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -431,7 +451,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ @@ -431,7 +451,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \
431 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 451 /usr/include/qt5/QtCore/qoldbasicatomic.h \
432 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 452 /usr/include/qt5/QtCore/qatomic_vxworks.h \
433 /usr/include/qt5/QtCore/qatomic_power.h \ 453 /usr/include/qt5/QtCore/qatomic_power.h \
434 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
435 /usr/include/qt5/QtCore/qatomic_alpha.h \ 454 /usr/include/qt5/QtCore/qatomic_alpha.h \
436 /usr/include/qt5/QtCore/qatomic_armv7.h \ 455 /usr/include/qt5/QtCore/qatomic_armv7.h \
437 /usr/include/qt5/QtCore/qatomic_armv6.h \ 456 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -542,7 +561,6 @@ moc_chatroomselect.cpp: /usr/include/qt5/QtWidgets/QDialog \ @@ -542,7 +561,6 @@ moc_chatroomselect.cpp: /usr/include/qt5/QtWidgets/QDialog \
542 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 561 /usr/include/qt5/QtCore/qoldbasicatomic.h \
543 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 562 /usr/include/qt5/QtCore/qatomic_vxworks.h \
544 /usr/include/qt5/QtCore/qatomic_power.h \ 563 /usr/include/qt5/QtCore/qatomic_power.h \
545 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
546 /usr/include/qt5/QtCore/qatomic_alpha.h \ 564 /usr/include/qt5/QtCore/qatomic_alpha.h \
547 /usr/include/qt5/QtCore/qatomic_armv7.h \ 565 /usr/include/qt5/QtCore/qatomic_armv7.h \
548 /usr/include/qt5/QtCore/qatomic_armv6.h \ 566 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -653,7 +671,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ @@ -653,7 +671,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
653 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 671 /usr/include/qt5/QtCore/qoldbasicatomic.h \
654 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 672 /usr/include/qt5/QtCore/qatomic_vxworks.h \
655 /usr/include/qt5/QtCore/qatomic_power.h \ 673 /usr/include/qt5/QtCore/qatomic_power.h \
656 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
657 /usr/include/qt5/QtCore/qatomic_alpha.h \ 674 /usr/include/qt5/QtCore/qatomic_alpha.h \
658 /usr/include/qt5/QtCore/qatomic_armv7.h \ 675 /usr/include/qt5/QtCore/qatomic_armv7.h \
659 /usr/include/qt5/QtCore/qatomic_armv6.h \ 676 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -796,7 +813,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ @@ -796,7 +813,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \
796 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 813 /usr/include/qt5/QtCore/qoldbasicatomic.h \
797 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 814 /usr/include/qt5/QtCore/qatomic_vxworks.h \
798 /usr/include/qt5/QtCore/qatomic_power.h \ 815 /usr/include/qt5/QtCore/qatomic_power.h \
799 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
800 /usr/include/qt5/QtCore/qatomic_alpha.h \ 816 /usr/include/qt5/QtCore/qatomic_alpha.h \
801 /usr/include/qt5/QtCore/qatomic_armv7.h \ 817 /usr/include/qt5/QtCore/qatomic_armv7.h \
802 /usr/include/qt5/QtCore/qatomic_armv6.h \ 818 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -876,6 +892,7 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ @@ -876,6 +892,7 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \
876 /usr/include/qt5/QtWidgets/qmainwindow.h \ 892 /usr/include/qt5/QtWidgets/qmainwindow.h \
877 /usr/include/qt5/QtWidgets/qtabwidget.h \ 893 /usr/include/qt5/QtWidgets/qtabwidget.h \
878 /usr/include/qt5/QtGui/qicon.h \ 894 /usr/include/qt5/QtGui/qicon.h \
  895 + ../QChatClient/chatwindow.h \
879 /usr/include/qt5/QtWidgets/QApplication \ 896 /usr/include/qt5/QtWidgets/QApplication \
880 /usr/include/qt5/QtWidgets/qapplication.h \ 897 /usr/include/qt5/QtWidgets/qapplication.h \
881 /usr/include/qt5/QtCore/qcoreapplication.h \ 898 /usr/include/qt5/QtCore/qcoreapplication.h \
@@ -919,7 +936,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ @@ -919,7 +936,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \
919 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 936 /usr/include/qt5/QtCore/qoldbasicatomic.h \
920 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 937 /usr/include/qt5/QtCore/qatomic_vxworks.h \
921 /usr/include/qt5/QtCore/qatomic_power.h \ 938 /usr/include/qt5/QtCore/qatomic_power.h \
922 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
923 /usr/include/qt5/QtCore/qatomic_alpha.h \ 939 /usr/include/qt5/QtCore/qatomic_alpha.h \
924 /usr/include/qt5/QtCore/qatomic_armv7.h \ 940 /usr/include/qt5/QtCore/qatomic_armv7.h \
925 /usr/include/qt5/QtCore/qatomic_armv6.h \ 941 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -1034,7 +1050,8 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ @@ -1034,7 +1050,8 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \
1034 /usr/include/qt5/QtWidgets/QMenuBar \ 1050 /usr/include/qt5/QtWidgets/QMenuBar \
1035 /usr/include/qt5/QtWidgets/qmenubar.h \ 1051 /usr/include/qt5/QtWidgets/qmenubar.h \
1036 /usr/include/qt5/QtWidgets/qmenu.h \ 1052 /usr/include/qt5/QtWidgets/qmenu.h \
1037 - /usr/include/qt5/QtWidgets/QSpacerItem \ 1053 + /usr/include/qt5/QtWidgets/QSplitter \
  1054 + /usr/include/qt5/QtWidgets/qsplitter.h \
1038 /usr/include/qt5/QtWidgets/QTextBrowser \ 1055 /usr/include/qt5/QtWidgets/QTextBrowser \
1039 /usr/include/qt5/QtWidgets/qtextbrowser.h \ 1056 /usr/include/qt5/QtWidgets/qtextbrowser.h \
1040 /usr/include/qt5/QtWidgets/qtextedit.h \ 1057 /usr/include/qt5/QtWidgets/qtextedit.h \
@@ -1081,7 +1098,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ @@ -1081,7 +1098,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \
1081 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 1098 /usr/include/qt5/QtCore/qoldbasicatomic.h \
1082 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 1099 /usr/include/qt5/QtCore/qatomic_vxworks.h \
1083 /usr/include/qt5/QtCore/qatomic_power.h \ 1100 /usr/include/qt5/QtCore/qatomic_power.h \
1084 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
1085 /usr/include/qt5/QtCore/qatomic_alpha.h \ 1101 /usr/include/qt5/QtCore/qatomic_alpha.h \
1086 /usr/include/qt5/QtCore/qatomic_armv7.h \ 1102 /usr/include/qt5/QtCore/qatomic_armv7.h \
1087 /usr/include/qt5/QtCore/qatomic_armv6.h \ 1103 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -1244,7 +1260,6 @@ chatroomselect.o: ../QChatClient/chatroomselect.cpp ../QChatClient/chatroomselec @@ -1244,7 +1260,6 @@ chatroomselect.o: ../QChatClient/chatroomselect.cpp ../QChatClient/chatroomselec
1244 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 1260 /usr/include/qt5/QtCore/qoldbasicatomic.h \
1245 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 1261 /usr/include/qt5/QtCore/qatomic_vxworks.h \
1246 /usr/include/qt5/QtCore/qatomic_power.h \ 1262 /usr/include/qt5/QtCore/qatomic_power.h \
1247 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
1248 /usr/include/qt5/QtCore/qatomic_alpha.h \ 1263 /usr/include/qt5/QtCore/qatomic_alpha.h \
1249 /usr/include/qt5/QtCore/qatomic_armv7.h \ 1264 /usr/include/qt5/QtCore/qatomic_armv7.h \
1250 /usr/include/qt5/QtCore/qatomic_armv6.h \ 1265 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -1401,7 +1416,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ @@ -1401,7 +1416,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \
1401 /usr/include/qt5/QtCore/qoldbasicatomic.h \ 1416 /usr/include/qt5/QtCore/qoldbasicatomic.h \
1402 /usr/include/qt5/QtCore/qatomic_vxworks.h \ 1417 /usr/include/qt5/QtCore/qatomic_vxworks.h \
1403 /usr/include/qt5/QtCore/qatomic_power.h \ 1418 /usr/include/qt5/QtCore/qatomic_power.h \
1404 - /usr/include/qt5/QtCore/qatomic_aarch64.h \  
1405 /usr/include/qt5/QtCore/qatomic_alpha.h \ 1419 /usr/include/qt5/QtCore/qatomic_alpha.h \
1406 /usr/include/qt5/QtCore/qatomic_armv7.h \ 1420 /usr/include/qt5/QtCore/qatomic_armv7.h \
1407 /usr/include/qt5/QtCore/qatomic_armv6.h \ 1421 /usr/include/qt5/QtCore/qatomic_armv6.h \
@@ -1492,6 +1506,8 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ @@ -1492,6 +1506,8 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \
1492 /usr/include/qt5/QtGui/qinputmethod.h \ 1506 /usr/include/qt5/QtGui/qinputmethod.h \
1493 /usr/include/qt5/QtWidgets/QButtonGroup \ 1507 /usr/include/qt5/QtWidgets/QButtonGroup \
1494 /usr/include/qt5/QtWidgets/qbuttongroup.h \ 1508 /usr/include/qt5/QtWidgets/qbuttongroup.h \
  1509 + /usr/include/qt5/QtWidgets/QFrame \
  1510 + /usr/include/qt5/QtWidgets/qframe.h \
1495 /usr/include/qt5/QtWidgets/QGridLayout \ 1511 /usr/include/qt5/QtWidgets/QGridLayout \
1496 /usr/include/qt5/QtWidgets/qgridlayout.h \ 1512 /usr/include/qt5/QtWidgets/qgridlayout.h \
1497 /usr/include/qt5/QtWidgets/qlayout.h \ 1513 /usr/include/qt5/QtWidgets/qlayout.h \
@@ -1501,7 +1517,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ @@ -1501,7 +1517,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \
1501 /usr/include/qt5/QtWidgets/qheaderview.h \ 1517 /usr/include/qt5/QtWidgets/qheaderview.h \
1502 /usr/include/qt5/QtWidgets/qabstractitemview.h \ 1518 /usr/include/qt5/QtWidgets/qabstractitemview.h \
1503 /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ 1519 /usr/include/qt5/QtWidgets/qabstractscrollarea.h \
1504 - /usr/include/qt5/QtWidgets/qframe.h \  
1505 /usr/include/qt5/QtCore/qabstractitemmodel.h \ 1520 /usr/include/qt5/QtCore/qabstractitemmodel.h \
1506 /usr/include/qt5/QtCore/qitemselectionmodel.h \ 1521 /usr/include/qt5/QtCore/qitemselectionmodel.h \
1507 /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ 1522 /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \
build-QChatClient-Desktop-Debug/QChatClient
No preview for this file type
build-QChatClient-Desktop-Debug/ui_chatwindow.h
1 /******************************************************************************** 1 /********************************************************************************
2 ** Form generated from reading UI file 'chatwindow.ui' 2 ** Form generated from reading UI file 'chatwindow.ui'
3 ** 3 **
4 -** Created by: Qt User Interface Compiler version 5.0.2 4 +** Created by: Qt User Interface Compiler version 5.0.1
5 ** 5 **
6 ** WARNING! All changes made in this file will be lost when recompiling UI file! 6 ** WARNING! All changes made in this file will be lost when recompiling UI file!
7 ********************************************************************************/ 7 ********************************************************************************/
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 #include <QtWidgets/QHeaderView> 17 #include <QtWidgets/QHeaderView>
18 #include <QtWidgets/QMainWindow> 18 #include <QtWidgets/QMainWindow>
19 #include <QtWidgets/QMenuBar> 19 #include <QtWidgets/QMenuBar>
20 -#include <QtWidgets/QSpacerItem> 20 +#include <QtWidgets/QSplitter>
21 #include <QtWidgets/QTextBrowser> 21 #include <QtWidgets/QTextBrowser>
22 #include <QtWidgets/QTextEdit> 22 #include <QtWidgets/QTextEdit>
23 #include <QtWidgets/QWidget> 23 #include <QtWidgets/QWidget>
@@ -29,13 +29,11 @@ class Ui_ChatWindow @@ -29,13 +29,11 @@ class Ui_ChatWindow
29 public: 29 public:
30 QWidget *centralWidget; 30 QWidget *centralWidget;
31 QGridLayout *gridLayout; 31 QGridLayout *gridLayout;
32 - QSpacerItem *verticalSpacer; 32 + QWidget *widget;
  33 + QGridLayout *gridLayout_2;
  34 + QSplitter *splitter;
33 QTextBrowser *chatText; 35 QTextBrowser *chatText;
34 - QSpacerItem *verticalSpacer_2;  
35 - QSpacerItem *horizontalSpacer_2;  
36 QTextEdit *inputText; 36 QTextEdit *inputText;
37 - QSpacerItem *horizontalSpacer;  
38 - QSpacerItem *verticalSpacer_3;  
39 QMenuBar *menuBar; 37 QMenuBar *menuBar;
40 38
41 void setupUi(QMainWindow *ChatWindow) 39 void setupUi(QMainWindow *ChatWindow)
@@ -55,42 +53,40 @@ public: @@ -55,42 +53,40 @@ public:
55 gridLayout->setSpacing(6); 53 gridLayout->setSpacing(6);
56 gridLayout->setContentsMargins(11, 11, 11, 11); 54 gridLayout->setContentsMargins(11, 11, 11, 11);
57 gridLayout->setObjectName(QStringLiteral("gridLayout")); 55 gridLayout->setObjectName(QStringLiteral("gridLayout"));
58 - verticalSpacer = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed);  
59 -  
60 - gridLayout->addItem(verticalSpacer, 2, 1, 1, 1);  
61 -  
62 - chatText = new QTextBrowser(centralWidget); 56 + widget = new QWidget(centralWidget);
  57 + widget->setObjectName(QStringLiteral("widget"));
  58 + gridLayout_2 = new QGridLayout(widget);
  59 + gridLayout_2->setSpacing(6);
  60 + gridLayout_2->setContentsMargins(11, 11, 11, 11);
  61 + gridLayout_2->setObjectName(QStringLiteral("gridLayout_2"));
  62 + splitter = new QSplitter(widget);
  63 + splitter->setObjectName(QStringLiteral("splitter"));
  64 + splitter->setOrientation(Qt::Vertical);
  65 + chatText = new QTextBrowser(splitter);
63 chatText->setObjectName(QStringLiteral("chatText")); 66 chatText->setObjectName(QStringLiteral("chatText"));
64 -  
65 - gridLayout->addWidget(chatText, 1, 1, 1, 1);  
66 -  
67 - verticalSpacer_2 = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed);  
68 -  
69 - gridLayout->addItem(verticalSpacer_2, 0, 1, 1, 1);  
70 -  
71 - horizontalSpacer_2 = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);  
72 -  
73 - gridLayout->addItem(horizontalSpacer_2, 1, 2, 1, 1);  
74 -  
75 - inputText = new QTextEdit(centralWidget);  
76 - inputText->setObjectName(QStringLiteral("inputText"));  
77 - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed); 67 + QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Ignored);
78 sizePolicy1.setHorizontalStretch(0); 68 sizePolicy1.setHorizontalStretch(0);
79 sizePolicy1.setVerticalStretch(0); 69 sizePolicy1.setVerticalStretch(0);
80 - sizePolicy1.setHeightForWidth(inputText->sizePolicy().hasHeightForWidth());  
81 - inputText->setSizePolicy(sizePolicy1);  
82 - inputText->setMinimumSize(QSize(0, 100));  
83 - inputText->setMaximumSize(QSize(16777215, 100));  
84 -  
85 - gridLayout->addWidget(inputText, 3, 1, 1, 1);  
86 -  
87 - horizontalSpacer = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum); 70 + sizePolicy1.setHeightForWidth(chatText->sizePolicy().hasHeightForWidth());
  71 + chatText->setSizePolicy(sizePolicy1);
  72 + splitter->addWidget(chatText);
  73 + inputText = new QTextEdit(splitter);
  74 + inputText->setObjectName(QStringLiteral("inputText"));
  75 + inputText->setEnabled(true);
  76 + QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Preferred);
  77 + sizePolicy2.setHorizontalStretch(0);
  78 + sizePolicy2.setVerticalStretch(0);
  79 + sizePolicy2.setHeightForWidth(inputText->sizePolicy().hasHeightForWidth());
  80 + inputText->setSizePolicy(sizePolicy2);
  81 + inputText->setMinimumSize(QSize(0, 0));
  82 + inputText->setMaximumSize(QSize(16777215, 16777215));
  83 + inputText->setBaseSize(QSize(0, 0));
  84 + splitter->addWidget(inputText);
88 85
89 - gridLayout->addItem(horizontalSpacer, 1, 0, 1, 1); 86 + gridLayout_2->addWidget(splitter, 0, 0, 1, 1);
90 87
91 - verticalSpacer_3 = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed);  
92 88
93 - gridLayout->addItem(verticalSpacer_3, 4, 1, 1, 1); 89 + gridLayout->addWidget(widget, 1, 0, 1, 1);
94 90
95 ChatWindow->setCentralWidget(centralWidget); 91 ChatWindow->setCentralWidget(centralWidget);
96 menuBar = new QMenuBar(ChatWindow); 92 menuBar = new QMenuBar(ChatWindow);