Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-05 04:44:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Moved to display own video at bottom and Friend at top.

Browse source 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-12-06 14:21:36 +00:00
parent 7a06e2f449
commit b11459329b
7 changed files with 101 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

44
retroshare-gui/src/gui/chat/ChatWidget.ui
View file

@ -540,14 +540,20 @@ border-image: url(:/images/closepressed.png)
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
<enum>Qt::TabFocus</enum>
</property>
<property name="toolTip">
<string>Font</string>
<string>Set text font &amp; color</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/fonts.png</normaloff>:/images/fonts.png</iconset>
<normaloff>:/images/textedit/format-text-color.png</normaloff>:/images/textedit/format-text-color.png</iconset>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
@ -557,31 +563,6 @@ border-image: url(:/images/closepressed.png)
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="colorButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Text Color</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="attachPictureButton">
<property name="minimumSize">
@ -629,7 +610,7 @@ border-image: url(:/images/closepressed.png)
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Add a File for your Friend</string>
<string>Attach a File</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
@ -836,6 +817,11 @@ border-image: url(:/images/closepressed.png)
<string>WARNING: Could take long time on big history.</string>
</property>
</action>
<action name="actionChooseColor">
<property name="text">
<string>Choose color</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>