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

* removed frame

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-08 18:28:18 +00:00
parent c3f610c519
commit e6367a2947
2 changed files with 42 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

130
retroshare-gui/src/gui/MessengerWindow.ui
View file

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>282</width> <width>270</width>
<height>534</height> <height>511</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -45,16 +45,16 @@
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="leftMargin" >
<number>0</number> <number>6</number>
</property> </property>
<property name="topMargin" > <property name="topMargin" >
<number>0</number> <number>6</number>
</property> </property>
<property name="rightMargin" > <property name="rightMargin" >
<number>0</number> <number>6</number>
</property> </property>
<property name="bottomMargin" > <property name="bottomMargin" >
<number>0</number> <number>2</number>
</property> </property>
<property name="horizontalSpacing" > <property name="horizontalSpacing" >
<number>0</number> <number>0</number>
@ -62,26 +62,8 @@
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" colspan="2" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" >
<number>4</number>
</property>
<property name="topMargin" >
<number>4</number>
</property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>4</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QToolButton" name="avatarButton" > <widget class="QToolButton" name="avatarButton" >
<property name="toolTip" > <property name="toolTip" >
@ -224,73 +206,43 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QFrame" name="frame" > <widget class="QToolButton" name="shareButton" >
<property name="frameShape" > <property name="toolTip" >
<enum>QFrame::StyledPanel</enum> <string>Share Files for your Friends</string>
</property> </property>
<property name="frameShadow" > <property name="styleSheet" >
<enum>QFrame::Raised</enum> <string/>
</property>
<property name="text" >
<string>...</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/friendsfolder24.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
</property> </property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QToolButton" name="shareButton" >
<property name="toolTip" >
<string>Share Files for your Friends</string>
</property>
<property name="styleSheet" >
<string/>
</property>
<property name="text" >
<string>...</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/friendsfolder24.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>211</width>
<height>34</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>221</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -380,7 +332,7 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>282</width> <width>270</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>

2
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -239,7 +239,7 @@ void PopupChatDialog::addChatMsg(ChatInfo *ci)
.replace(font) .replace(font)
.replace(fontSize)*/ .replace(fontSize)*/
.replace("%timestamp%", timestamp) .replace("%timestamp%", timestamp)
.replace("%name%", name) .replace("%name%", name)
.replace("%message%", message); .replace("%message%", message);
ui.textBrowser->setHtml(ui.textBrowser->toHtml() + formatMsg + "\n"); ui.textBrowser->setHtml(ui.textBrowser->toHtml() + formatMsg + "\n");