Skip to content

Commit

Permalink
FIX(client): Chatbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hartmnt
Hartmnt committed Sep 29, 2024
1 parent 0a033af commit ebf27cf
Showing 1 changed file with 98 additions and 25 deletions.
123 changes: 98 additions & 25 deletions src/mumble/MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
<x>0</x>
<y>0</y>
<width>735</width>
<height>435</height>
<height>455</height>
</rect>
</property>
<property name="windowTitle">
<string>Mumble</string>
</property>
<property name="dockOptions">
<set>QMainWindow::AllowNestedDocks|QMainWindow::AnimatedDocks</set>
<set>QMainWindow::DockOption::AllowNestedDocks|QMainWindow::DockOption::AnimatedDocks</set>
</property>
<property name="unifiedTitleAndToolBarOnMac">
<bool>true</bool>
</property>
<widget class="UserView" name="qtvUsers">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
</property>
<property name="acceptDrops">
<bool>true</bool>
Expand All @@ -48,7 +48,7 @@
<x>0</x>
<y>0</y>
<width>735</width>
<height>32</height>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="qmConfig">
Expand Down Expand Up @@ -103,7 +103,7 @@
</size>
</property>
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetClosable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Log</string>
Expand All @@ -113,7 +113,7 @@
</attribute>
<widget class="LogTextBrowser" name="qteLog">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
</property>
<property name="whatsThis">
<string>This shows all recent activity. Connecting to servers, errors and information messages all show up here.&lt;br /&gt;To configure exactly which messages show up here, use the &lt;b&gt;Settings&lt;/b&gt; command from the menu.</string>
Expand All @@ -128,45 +128,118 @@
</widget>
<widget class="QDockWidget" name="qdwChat">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>260</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string>This is the chatbar&lt;br /&gt;If you enter text here and then press enter the text is sent to the user or channel that was selected. If nothing is selected the message is sent to your current channel.</string>
</property>
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set>
<set>QDockWidget::DockWidgetFeature::DockWidgetClosable|QDockWidget::DockWidgetFeature::DockWidgetMovable</set>
</property>
<property name="windowTitle">
<string>Chatbar</string>
</property>
<attribute name="dockWidgetArea">
<number>1</number>
</attribute>
<widget class="ChatbarTextEdit" name="qteChat">
<widget class="QScrollArea" name="scrollAreaChat">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="accessibleName">
<string>Enter chat message</string>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="acceptRichText">
<bool>false</bool>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignTop</set>
</property>
<widget class="QWidget" name="scrollAreaChatWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>260</width>
<height>196</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QGridLayout" name="scrollAreaChatWidgetLayout">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="ChatbarTextEdit" name="qteChat">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="accessibleName">
<string>Enter chat message</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
<widget class="QToolBar" name="qtIconToolbar">
Expand Down Expand Up @@ -205,10 +278,10 @@
<bool>false</bool>
</property>
<property name="features">
<set>QDockWidget::NoDockWidgetFeatures</set>
<set>QDockWidget::DockWidgetFeature::NoDockWidgetFeatures</set>
</property>
<property name="allowedAreas">
<set>Qt::AllDockWidgetAreas</set>
<set>Qt::DockWidgetArea::AllDockWidgetAreas</set>
</property>
<attribute name="dockWidgetArea">
<number>4</number>
Expand Down Expand Up @@ -603,7 +676,7 @@
<string>Allows you to change most settings for Mumble.</string>
</property>
<property name="menuRole">
<enum>QAction::PreferencesRole</enum>
<enum>QAction::MenuRole::PreferencesRole</enum>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
Expand Down Expand Up @@ -693,7 +766,7 @@ the channel's context menu.</string>
<string>Shows a small dialog with information and license for Mumble.</string>
</property>
<property name="menuRole">
<enum>QAction::AboutRole</enum>
<enum>QAction::MenuRole::AboutRole</enum>
</property>
</action>
<action name="qaHelpAboutSpeex">
Expand All @@ -707,7 +780,7 @@ the channel's context menu.</string>
<string>Shows a small dialog with information about Speex.</string>
</property>
<property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum>
<enum>QAction::MenuRole::ApplicationSpecificRole</enum>
</property>
</action>
<action name="qaHelpAboutQt">
Expand All @@ -721,7 +794,7 @@ the channel's context menu.</string>
<string>Shows a small dialog with information about Qt.</string>
</property>
<property name="menuRole">
<enum>QAction::AboutQtRole</enum>
<enum>QAction::MenuRole::AboutQtRole</enum>
</property>
</action>
<action name="qaHelpVersionCheck">
Expand Down

0 comments on commit ebf27cf

Please sign in to comment.