commit 564e97b8a9b78a9c95c040ec1db576e3d2aa3048
parent 040bd0b6dc5701d9435a42ffd8d96dbbe252bf1d
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 26 Aug 2017 14:09:30 +0200
More Work on the Main Design
Signed-off-by: MTRNord <mtrnord1@gmail.com>
Diffstat:
10 files changed, 181 insertions(+), 104 deletions(-)
diff --git a/qml/icons/cog-outline.svg b/qml/icons/cog-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 5l.855 3.42 3.389-.971 1.501 2.6-2.535 2.449 2.535 2.451-1.5 2.6-3.39-.971-.855 3.422h-3l-.855-3.422-3.39.971-1.501-2.6 2.535-2.451-2.534-2.449 1.5-2.6 3.39.971.855-3.42h3m0-2h-3c-.918 0-1.718.625-1.939 1.516l-.354 1.412-1.4-.4c-.184-.053-.369-.078-.552-.078-.7 0-1.368.37-1.731 1l-1.5 2.6c-.459.796-.317 1.802.342 2.438l1.047 1.011-1.048 1.015c-.66.637-.802 1.643-.343 2.438l1.502 2.6c.363.631 1.031 1 1.731 1 .183 0 .368-.025.552-.076l1.399-.401.354 1.415c.222.885 1.022 1.51 1.94 1.51h3c.918 0 1.718-.625 1.939-1.516l.354-1.414 1.399.4c.184.053.369.077.552.077.7 0 1.368-.37 1.731-1l1.5-2.6c.459-.796.317-1.8-.342-2.438l-1.047-1.013 1.047-1.013c.66-.637.801-1.644.342-2.438l-1.5-2.6c-.365-.631-1.031-1-1.732-1-.184 0-.368.025-.551.076l-1.4.401-.354-1.413c-.22-.884-1.02-1.509-1.938-1.509zM11.5 10.5c1.104 0 2 .895 2 2 0 1.104-.896 2-2 2s-2-.896-2-2c0-1.105.896-2 2-2m0-1c-1.654 0-3 1.346-3 3s1.346 3 3 3 3-1.346 3-3-1.346-3-3-3z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/phone-outline.svg b/qml/icons/phone-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.502 3.672l-1.795-1.793c-.566-.567-1.32-.879-2.121-.879s-1.555.312-2.121.879l-1.586 1.586c-1.17 1.17-1.17 3.072 0 4.242l1.379 1.379-4.172 4.172-1.379-1.379c-.566-.567-1.32-.879-2.121-.879s-1.555.312-2.121.879l-1.586 1.586c-1.17 1.17-1.17 3.072 0 4.242l1.794 1.793c.465.465 1.796 1.545 4.116 1.545 2.764 0 5.694-1.529 8.711-4.545 6.245-6.246 4.825-11.002 3.002-12.828zm-6.209 1.207l1.586-1.586c.195-.195.451-.293.707-.293s.512.098.707.293l1.083 1.082-3.001 3-1.082-1.082c-.391-.391-.391-1.023 0-1.414zm-10 11.414c-.391-.391-.391-1.023 0-1.414l1.586-1.586c.195-.195.451-.293.707-.293s.512.098.707.293l1.082 1.082-2.999 3-1.083-1.082zm11.793-1.207c-3.083 3.082-5.551 3.959-7.297 3.959-1.349 0-2.267-.523-2.702-.959-.004-.004 2.995-3.004 2.995-3.004l.297.297c.195.195.451.293.707.293s.512-.098.707-.293l5.586-5.586c.391-.391.391-1.023 0-1.414l-.297-.297 3.001-3c1.003 1.004 2.467 4.539-2.997 10.004z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/plus-outline.svg b/qml/icons/plus-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 21c-1.654 0-3-1.346-3-3l.053-3.053-3.035.053c-1.672 0-3.018-1.346-3.018-3s1.346-3 3-3l3.053-.054-.053-2.928c0-1.672 1.346-3.018 3-3.018s3 1.346 3 3l.055 2.946 2.963.054c1.636 0 2.982 1.346 2.982 3s-1.346 3-3 3l-2.945-.053-.055 3.071c0 1.636-1.346 2.982-3 2.982zm-1-8v5.018c0 .533.449.982 1 .982s1-.449 1-1v-5h5.018c.533 0 .982-.449.982-1s-.449-1-1-1h-5v-5c0-.569-.449-1-1-1s-1 .449-1 1v5h-5c-.569 0-1 .449-1 1s.449 1 1 1h5z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/plus.svg b/qml/icons/plus.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M18 10h-4v-4c0-1.104-.896-2-2-2s-2 .896-2 2l.071 4h-4.071c-1.104 0-2 .896-2 2s.896 2 2 2l4.071-.071-.071 4.071c0 1.104.896 2 2 2s2-.896 2-2v-4.071l4 .071c1.104 0 2-.896 2-2s-.896-2-2-2z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/th-menu-outline.svg b/qml/icons/th-menu-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 18c.55 0 1 .45 1 1s-.45 1-1 1h-14c-.55 0-1-.45-1-1s.45-1 1-1h14m0-2h-14c-1.654 0-3 1.346-3 3s1.346 3 3 3h14c1.654 0 3-1.346 3-3s-1.346-3-3-3zM19 11c.55 0 1 .45 1 1s-.45 1-1 1h-14c-.55 0-1-.45-1-1s.45-1 1-1h14m0-2h-14c-1.654 0-3 1.346-3 3s1.346 3 3 3h14c1.654 0 3-1.346 3-3s-1.346-3-3-3zM19 4c.55 0 1 .45 1 1s-.45 1-1 1h-14c-.55 0-1-.45-1-1s.45-1 1-1h14m0-2h-14c-1.654 0-3 1.346-3 3s1.346 3 3 3h14c1.654 0 3-1.346 3-3s-1.346-3-3-3z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/th-menu.svg b/qml/icons/th-menu.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/user-outline.svg b/qml/icons/user-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 6c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3m0-2c-2.764 0-5 2.238-5 5s2.236 5 5 5 5-2.238 5-5-2.236-5-5-5zM12 17c2.021 0 3.301.771 3.783 1.445-.683.26-1.969.555-3.783.555-1.984 0-3.206-.305-3.818-.542.459-.715 1.777-1.458 3.818-1.458m0-2c-3.75 0-6 2-6 4 0 1 2.25 2 6 2 3.518 0 6-1 6-2 0-2-2.354-4-6-4z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/user.svg b/qml/icons/user.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 9c0-1.381-.56-2.631-1.464-3.535-.905-.905-2.155-1.465-3.536-1.465s-2.631.56-3.536 1.465c-.904.904-1.464 2.154-1.464 3.535s.56 2.631 1.464 3.535c.905.905 2.155 1.465 3.536 1.465s2.631-.56 3.536-1.465c.904-.904 1.464-2.154 1.464-3.535zM6 19c0 1 2.25 2 6 2 3.518 0 6-1 6-2 0-2-2.354-4-6-4-3.75 0-6 2-6 4z"/></svg>
+\ No newline at end of file
diff --git a/qml/icons/video-outline.svg b/qml/icons/video-outline.svg
@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><circle cx="7" cy="11" r="1"/><path d="M21.585 7.188c-.262-.188-.599-.241-.901-.137l-1.707.568c-.188-1.477-1.451-2.62-2.977-2.62h-11c-1.654 0-3 1.347-3 3v6c0 1.653 1.346 3 3 3h3v1.111l.008.09c.066.738.381 1.423.887 1.928.562.562 1.311.872 2.104.872s1.542-.31 2.104-.87c.574-.577.898-1.346.896-2.113v-1.017h2c1.524 0 2.789-1.145 2.978-2.62l1.707.568c.303.104.64.051.9-.138.262-.188.415-.49.415-.812v-6c.001-.318-.153-.621-.414-.81zm-9.585 10.835c.001.248-.119.5-.309.689-.191.189-.441.286-.692.286-.25 0-.501-.097-.69-.286-.19-.189-.285-.441-.309-.691v-2.021h2v2.023zm5-4.023c0 .552-.448 1-1 1h-11c-.552 0-1-.448-1-1v-6c0-.552.448-1 1-1h11c.552 0 1 .448 1 1v6zm3-1.389s-1.895-.605-2-.605v-2.012c.105 0 2-.605 2-.605v3.222z"/></svg>
+\ No newline at end of file
diff --git a/qml/ui/chat.ui b/qml/ui/chat.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1585</width>
- <height>730</height>
+ <height>745</height>
</rect>
</property>
<property name="sizePolicy">
@@ -42,7 +42,7 @@
<number>0</number>
</property>
<item row="0" column="0">
- <widget class="QWidget" name="sidebarWidget_2" native="true">
+ <widget class="QWidget" name="sidebarWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -69,7 +69,7 @@
<number>0</number>
</property>
<item row="0" column="0">
- <widget class="QWidget" name="widget_5" native="true">
+ <widget class="QWidget" name="userAvatarLayout" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -95,7 +95,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap>../../../../../../../Downloads/avatar.png</pixmap>
+ <pixmap>../../../../../../../Downloads/avatar512.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -104,7 +104,7 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="QWidget" name="widget_4" native="true">
+ <widget class="QWidget" name="buttonAreaLayout" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -128,99 +128,154 @@
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="widget_6" native="true">
+ <widget class="QWidget" name="buttonsExceptSettings" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>84</number>
+ <number>65</number>
</property>
<property name="leftMargin">
- <number>0</number>
+ <number>7</number>
</property>
<property name="topMargin">
- <number>0</number>
+ <number>9</number>
</property>
<property name="rightMargin">
- <number>0</number>
+ <number>9</number>
</property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="pushButton_11">
- <property name="minimumSize">
- <size>
- <width>75</width>
- <height>27</height>
- </size>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_12">
- <property name="minimumSize">
- <size>
- <width>75</width>
- <height>28</height>
- </size>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
- </widget>
- </item>
<item>
- <widget class="QPushButton" name="pushButton_13">
- <property name="minimumSize">
- <size>
- <width>75</width>
- <height>27</height>
- </size>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
+ <widget class="QWidget" name="to1ChatButtonLayout" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="to1ChatButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>41</width>
+ <height>41</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/qml/icons/user.svg</normaloff>:/qml/icons/user.svg</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pushButton_14">
- <property name="minimumSize">
- <size>
- <width>75</width>
- <height>28</height>
- </size>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
+ <widget class="QWidget" name="newRoomButtonLayout" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="newRoomButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>41</width>
+ <height>41</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/qml/icons/plus.svg</normaloff>:/qml/icons/plus.svg</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pushButton_15">
- <property name="minimumSize">
- <size>
- <width>75</width>
- <height>27</height>
- </size>
- </property>
- <property name="text">
- <string>PushButton</string>
- </property>
+ <widget class="QWidget" name="directoryButtonLayout" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="directoryButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>41</width>
+ <height>41</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: 0;</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>:/qml/icons/th-menu.svg</normaloff>:/qml/icons/th-menu.svg</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="QWidget" name="widget_3" native="true">
+ <widget class="QWidget" name="settingsButtonLayout" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QPushButton" name="settingsMenuButton_3">
+ <widget class="QPushButton" name="settingsMenuButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -248,8 +303,8 @@
</property>
<property name="iconSize">
<size>
- <width>35</width>
- <height>35</height>
+ <width>25</width>
+ <height>25</height>
</size>
</property>
</widget>
@@ -258,18 +313,22 @@
</widget>
</item>
</layout>
+ <zorder>settingsButtonLayout</zorder>
+ <zorder>directoryButtonLayout</zorder>
+ <zorder>to1ChatButtonLayout</zorder>
+ <zorder>newRoomButtonLayout</zorder>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
- <zorder>widget_4</zorder>
- <zorder>widget_5</zorder>
+ <zorder>buttonAreaLayout</zorder>
+ <zorder>userAvatarLayout</zorder>
</widget>
</item>
<item row="0" column="1">
- <widget class="QWidget" name="widget_2" native="true">
+ <widget class="QWidget" name="RoomBarWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -293,7 +352,7 @@
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="widget" native="true">
+ <widget class="QWidget" name="SearchWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -317,7 +376,7 @@
<number>0</number>
</property>
<item row="0" column="0">
- <widget class="QLineEdit" name="SearchInput_2">
+ <widget class="QLineEdit" name="SearchInput">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -350,7 +409,7 @@ border-radius: 5px;</string>
</widget>
</item>
<item>
- <widget class="QScrollArea" name="RoomScroll_3">
+ <widget class="QScrollArea" name="roomBarArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -375,13 +434,13 @@ border-radius: 5px;</string>
<property name="widgetResizable">
<bool>true</bool>
</property>
- <widget class="QWidget" name="scrollAreaWidgetContents_4">
+ <widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>291</width>
- <height>681</height>
+ <height>696</height>
</rect>
</property>
<property name="minimumSize">
@@ -397,7 +456,7 @@ border-radius: 5px;</string>
</widget>
</item>
<item row="0" column="2">
- <widget class="QWidget" name="RoomWidget_2" native="true">
+ <widget class="QWidget" name="RoomWidget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
@@ -424,7 +483,7 @@ border-radius: 5px;</string>
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="titleBar_3" native="true">
+ <widget class="QWidget" name="titleBar" native="true">
<property name="minimumSize">
<size>
<width>901</width>
@@ -433,7 +492,7 @@ border-radius: 5px;</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
- <widget class="QLabel" name="RoomImage_3">
+ <widget class="QLabel" name="RoomImage">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -458,9 +517,9 @@ border-radius: 5px;</string>
</widget>
</item>
<item row="0" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="TitleLayout">
<item>
- <widget class="QLabel" name="RoomTitel_3">
+ <widget class="QLabel" name="RoomTitel">
<property name="minimumSize">
<size>
<width>611</width>
@@ -481,7 +540,7 @@ border-radius: 5px;</string>
</widget>
</item>
<item>
- <widget class="QLabel" name="subTitle_3">
+ <widget class="QLabel" name="subTitle">
<property name="minimumSize">
<size>
<width>611</width>
@@ -515,7 +574,7 @@ border-radius: 5px;</string>
</layout>
</item>
<item row="0" column="2">
- <widget class="QPushButton" name="videoCallButton_3">
+ <widget class="QPushButton" name="callButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -539,18 +598,18 @@ border-radius: 5px;</string>
</property>
<property name="icon">
<iconset>
- <normaloff>:/qml/icons/video.svg</normaloff>:/qml/icons/video.svg</iconset>
+ <normaloff>:/qml/icons/phone.svg</normaloff>:/qml/icons/phone.svg</iconset>
</property>
<property name="iconSize">
<size>
- <width>35</width>
- <height>35</height>
+ <width>25</width>
+ <height>25</height>
</size>
</property>
</widget>
</item>
<item row="0" column="3">
- <widget class="QPushButton" name="callButton_3">
+ <widget class="QPushButton" name="videoCallButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -571,12 +630,12 @@ border-radius: 5px;</string>
</property>
<property name="icon">
<iconset>
- <normaloff>:/qml/icons/phone.svg</normaloff>:/qml/icons/phone.svg</iconset>
+ <normaloff>:/qml/icons/video.svg</normaloff>:/qml/icons/video.svg</iconset>
</property>
<property name="iconSize">
<size>
- <width>35</width>
- <height>35</height>
+ <width>25</width>
+ <height>25</height>
</size>
</property>
</widget>
@@ -585,12 +644,12 @@ border-radius: 5px;</string>
</widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_7">
+ <layout class="QVBoxLayout" name="messageAreaLayout">
<property name="spacing">
<number>21</number>
</property>
<item>
- <widget class="QScrollArea" name="messageScroll_3">
+ <widget class="QScrollArea" name="messageScroll">
<property name="minimumSize">
<size>
<width>901</width>
@@ -603,7 +662,7 @@ border-radius: 5px;</string>
<property name="widgetResizable">
<bool>true</bool>
</property>
- <widget class="QWidget" name="scrollAreaWidgetContents_5">
+ <widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
@@ -622,7 +681,7 @@ border-radius: 5px;</string>
</widget>
</item>
<item>
- <widget class="QWidget" name="messageInputWrapper_2" native="true">
+ <widget class="QWidget" name="messageInputWrapper" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
@@ -637,7 +696,7 @@ border-radius: 5px;</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
- <widget class="QLineEdit" name="MessageInput_3">
+ <widget class="QLineEdit" name="MessageInput">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -676,9 +735,9 @@ padding: 3px</string>
</widget>
</item>
</layout>
- <zorder>widget_2</zorder>
- <zorder>sidebarWidget_2</zorder>
- <zorder>RoomWidget_2</zorder>
+ <zorder>RoomBarWidget</zorder>
+ <zorder>sidebarWidget</zorder>
+ <zorder>RoomWidget</zorder>
</widget>
<resources/>
<connections/>
