From 6c1aa7191d49f786340d38f3cb12c7eb3ddd7400 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Thu, 12 Dec 2013 01:09:10 +0000 Subject: [PATCH] git-svn-id: svn://imanolbarba.net/PAD@35 c2ee353e-ed0d-4329-bf56-03aec153487f --- JChatServer/src/pad/prac2/JChat.java | 4 ++-- QChatClient/QChatClient.pro.user | 9 ++++----- QChatClient/chatwindow.cpp | 2 ++ QChatClient/chatwindow.ui | 151 ++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- QChatClient/main.cpp | 3 ++- build-QChatClient-Desktop-Debug/Makefile | 47 +++++++++++++++++++++++++++++++---------------- build-QChatClient-Desktop-Debug/QChatClient | Bin 1082167 -> 0 bytes build-QChatClient-Desktop-Debug/ui_chatwindow.h | 70 +++++++++++++++++++++++++++++++++------------------------------------- 8 files changed, 122 insertions(+), 164 deletions(-) diff --git a/JChatServer/src/pad/prac2/JChat.java b/JChatServer/src/pad/prac2/JChat.java index bc269c4..a906273 100644 --- a/JChatServer/src/pad/prac2/JChat.java +++ b/JChatServer/src/pad/prac2/JChat.java @@ -22,8 +22,8 @@ public class JChat public void run() { System.out.println("JChat: Caught interrupt, killing server..."); - serv.killServer(); - } + serv.killServer(); + } }); serv.startServer(); } diff --git a/QChatClient/QChatClient.pro.user b/QChatClient/QChatClient.pro.user index d796947..a6254cb 100644 --- a/QChatClient/QChatClient.pro.user +++ b/QChatClient/QChatClient.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -15,7 +15,7 @@ Cpp - qt2 + CppGlobal @@ -53,7 +53,7 @@ Desktop Desktop - {430bae4e-c8d6-488c-936e-c89fd5587cd0} + {d6a12d1a-dee4-4341-8f4f-e2749eba145e} 0 0 0 @@ -189,7 +189,6 @@ ProjectExplorer.DefaultDeployConfiguration 1 - true @@ -247,7 +246,7 @@ ProjectExplorer.Project.Updater.EnvironmentId - {0fd5067a-d849-4d4e-9457-800baef2de83} + {fd24a9a9-cdbc-49b3-845c-b174fda2a7ac} ProjectExplorer.Project.Updater.FileVersion diff --git a/QChatClient/chatwindow.cpp b/QChatClient/chatwindow.cpp index 0f9fb06..835b08b 100644 --- a/QChatClient/chatwindow.cpp +++ b/QChatClient/chatwindow.cpp @@ -1,6 +1,8 @@ #include "chatwindow.h" #include "ui_chatwindow.h" +using namespace std; + ChatWindow::ChatWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::ChatWindow) diff --git a/QChatClient/chatwindow.ui b/QChatClient/chatwindow.ui index 3d92454..6ed6f15 100644 --- a/QChatClient/chatwindow.ui +++ b/QChatClient/chatwindow.ui @@ -24,110 +24,55 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 100 - - - - - 16777215 - 100 - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - + + + + + + Qt::Vertical + + + + + 0 + 0 + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + + + + diff --git a/QChatClient/main.cpp b/QChatClient/main.cpp index 9e23ff8..ca6117f 100644 --- a/QChatClient/main.cpp +++ b/QChatClient/main.cpp @@ -1,11 +1,12 @@ #include "loginscreen.h" #include "chatroom.h" +#include "chatwindow.h" #include int main(int argc, char *argv[]) { QApplication a(argc, argv); - Chatroom l; + ChatWindow l; l.show(); return a.exec(); diff --git a/build-QChatClient-Desktop-Debug/Makefile b/build-QChatClient-Desktop-Debug/Makefile index 51621e1..fb2d4f5 100644 --- a/build-QChatClient-Desktop-Debug/Makefile +++ b/build-QChatClient-Desktop-Debug/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: QChatClient -# Generated by qmake (3.0) (Qt 5.0.2) on: mié dic 11 19:16:50 2013 +# Generated by qmake (3.0) (Qt 5.0.1) on: jue dic 12 02:20:27 2013 # Project: ../QChatClient/QChatClient.pro # Template: app # 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 \ /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ @@ -95,8 +101,9 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/resolve_config.prf \ + /usr/share/qt5/mkspecs/features/debug.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ + /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /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 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ @@ -176,8 +189,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/resolve_config.prf \ + /usr/share/qt5/mkspecs/features/debug.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ + /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /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 /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri: /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri: /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qml.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_quick.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri: /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_v8.pri: /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: /usr/share/qt5/mkspecs/features/qt_functions.prf: @@ -227,8 +247,9 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma /usr/share/qt5/mkspecs/features/exclusive_builds.prf: /usr/share/qt5/mkspecs/features/default_pre.prf: /usr/share/qt5/mkspecs/features/unix/default_pre.prf: -/usr/share/qt5/mkspecs/features/resolve_config.prf: +/usr/share/qt5/mkspecs/features/debug.prf: /usr/share/qt5/mkspecs/features/default_post.prf: +/usr/share/qt5/mkspecs/features/shared.prf: /usr/share/qt5/mkspecs/features/qml_debug.prf: /usr/share/qt5/mkspecs/features/declarative_debug.prf: /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: @@ -254,7 +275,7 @@ qmake: FORCE qmake_all: FORCE dist: - @test -d .tmp/QChatClient1.0.0 || mkdir -p .tmp/QChatClient1.0.0 + @test -d .tmp/QChatClient1.0.0 || $(MKDIR) .tmp/QChatClient1.0.0 $(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 @@ -318,7 +339,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -431,7 +451,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -542,7 +561,6 @@ moc_chatroomselect.cpp: /usr/include/qt5/QtWidgets/QDialog \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -653,7 +671,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -796,7 +813,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -876,6 +892,7 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtWidgets/qmainwindow.h \ /usr/include/qt5/QtWidgets/qtabwidget.h \ /usr/include/qt5/QtGui/qicon.h \ + ../QChatClient/chatwindow.h \ /usr/include/qt5/QtWidgets/QApplication \ /usr/include/qt5/QtWidgets/qapplication.h \ /usr/include/qt5/QtCore/qcoreapplication.h \ @@ -919,7 +936,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1034,7 +1050,8 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtWidgets/QMenuBar \ /usr/include/qt5/QtWidgets/qmenubar.h \ /usr/include/qt5/QtWidgets/qmenu.h \ - /usr/include/qt5/QtWidgets/QSpacerItem \ + /usr/include/qt5/QtWidgets/QSplitter \ + /usr/include/qt5/QtWidgets/qsplitter.h \ /usr/include/qt5/QtWidgets/QTextBrowser \ /usr/include/qt5/QtWidgets/qtextbrowser.h \ /usr/include/qt5/QtWidgets/qtextedit.h \ @@ -1081,7 +1098,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1244,7 +1260,6 @@ chatroomselect.o: ../QChatClient/chatroomselect.cpp ../QChatClient/chatroomselec /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1401,7 +1416,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ - /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1492,6 +1506,8 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ /usr/include/qt5/QtGui/qinputmethod.h \ /usr/include/qt5/QtWidgets/QButtonGroup \ /usr/include/qt5/QtWidgets/qbuttongroup.h \ + /usr/include/qt5/QtWidgets/QFrame \ + /usr/include/qt5/QtWidgets/qframe.h \ /usr/include/qt5/QtWidgets/QGridLayout \ /usr/include/qt5/QtWidgets/qgridlayout.h \ /usr/include/qt5/QtWidgets/qlayout.h \ @@ -1501,7 +1517,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ /usr/include/qt5/QtWidgets/qheaderview.h \ /usr/include/qt5/QtWidgets/qabstractitemview.h \ /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ - /usr/include/qt5/QtWidgets/qframe.h \ /usr/include/qt5/QtCore/qabstractitemmodel.h \ /usr/include/qt5/QtCore/qitemselectionmodel.h \ /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ diff --git a/build-QChatClient-Desktop-Debug/QChatClient b/build-QChatClient-Desktop-Debug/QChatClient index 70b96e5..909c103 100755 Binary files a/build-QChatClient-Desktop-Debug/QChatClient and b/build-QChatClient-Desktop-Debug/QChatClient differ diff --git a/build-QChatClient-Desktop-Debug/ui_chatwindow.h b/build-QChatClient-Desktop-Debug/ui_chatwindow.h index 35c3582..6ccba73 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatwindow.h +++ b/build-QChatClient-Desktop-Debug/ui_chatwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'chatwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.0.2 +** Created by: Qt User Interface Compiler version 5.0.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -29,13 +29,11 @@ class Ui_ChatWindow public: QWidget *centralWidget; QGridLayout *gridLayout; - QSpacerItem *verticalSpacer; + QWidget *widget; + QGridLayout *gridLayout_2; + QSplitter *splitter; QTextBrowser *chatText; - QSpacerItem *verticalSpacer_2; - QSpacerItem *horizontalSpacer_2; QTextEdit *inputText; - QSpacerItem *horizontalSpacer; - QSpacerItem *verticalSpacer_3; QMenuBar *menuBar; void setupUi(QMainWindow *ChatWindow) @@ -55,42 +53,40 @@ public: gridLayout->setSpacing(6); gridLayout->setContentsMargins(11, 11, 11, 11); gridLayout->setObjectName(QStringLiteral("gridLayout")); - verticalSpacer = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed); - - gridLayout->addItem(verticalSpacer, 2, 1, 1, 1); - - chatText = new QTextBrowser(centralWidget); + widget = new QWidget(centralWidget); + widget->setObjectName(QStringLiteral("widget")); + gridLayout_2 = new QGridLayout(widget); + gridLayout_2->setSpacing(6); + gridLayout_2->setContentsMargins(11, 11, 11, 11); + gridLayout_2->setObjectName(QStringLiteral("gridLayout_2")); + splitter = new QSplitter(widget); + splitter->setObjectName(QStringLiteral("splitter")); + splitter->setOrientation(Qt::Vertical); + chatText = new QTextBrowser(splitter); chatText->setObjectName(QStringLiteral("chatText")); - - gridLayout->addWidget(chatText, 1, 1, 1, 1); - - verticalSpacer_2 = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed); - - gridLayout->addItem(verticalSpacer_2, 0, 1, 1, 1); - - horizontalSpacer_2 = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum); - - gridLayout->addItem(horizontalSpacer_2, 1, 2, 1, 1); - - inputText = new QTextEdit(centralWidget); - inputText->setObjectName(QStringLiteral("inputText")); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed); + QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Ignored); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(inputText->sizePolicy().hasHeightForWidth()); - inputText->setSizePolicy(sizePolicy1); - inputText->setMinimumSize(QSize(0, 100)); - inputText->setMaximumSize(QSize(16777215, 100)); - - gridLayout->addWidget(inputText, 3, 1, 1, 1); - - horizontalSpacer = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum); + sizePolicy1.setHeightForWidth(chatText->sizePolicy().hasHeightForWidth()); + chatText->setSizePolicy(sizePolicy1); + splitter->addWidget(chatText); + inputText = new QTextEdit(splitter); + inputText->setObjectName(QStringLiteral("inputText")); + inputText->setEnabled(true); + QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Preferred); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(inputText->sizePolicy().hasHeightForWidth()); + inputText->setSizePolicy(sizePolicy2); + inputText->setMinimumSize(QSize(0, 0)); + inputText->setMaximumSize(QSize(16777215, 16777215)); + inputText->setBaseSize(QSize(0, 0)); + splitter->addWidget(inputText); - gridLayout->addItem(horizontalSpacer, 1, 0, 1, 1); + gridLayout_2->addWidget(splitter, 0, 0, 1, 1); - verticalSpacer_3 = new QSpacerItem(20, 5, QSizePolicy::Minimum, QSizePolicy::Fixed); - gridLayout->addItem(verticalSpacer_3, 4, 1, 1, 1); + gridLayout->addWidget(widget, 1, 0, 1, 1); ChatWindow->setCentralWidget(centralWidget); menuBar = new QMenuBar(ChatWindow); -- libgit2 0.22.2