* replaced toText in MessagesDialog QTextEdit with QTextBrowser to get use a scrollbar

* update little bit ProfileView(added function for load a image to picture label, added a Button for Edit Profile) 
* set context menu icon for Connect To Friend
* Fixed OnlineToaster's Picture Label Layout
* set for Make Friend a Header Image and Text

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-23 01:58:56 +00:00
parent 80a8b41d66
commit 643379aec7
13 changed files with 412 additions and 352 deletions

View file

@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>759</width>
<height>520</height>
<height>557</height>
</rect>
</property>
<property name="sizePolicy" >
@ -505,7 +505,7 @@
<enum>Qt::DefaultContextMenu</enum>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<item row="1" column="0" >
<widget class="QPushButton" name="newmessageButton" >
<property name="minimumSize" >
<size>
@ -526,7 +526,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">New Message&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="styleSheet" >
<string/>
<string notr="true" />
</property>
<property name="text" >
<string/>
@ -542,7 +542,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="1" >
<item row="1" column="1" >
<widget class="QPushButton" name="replymessageButton" >
<property name="minimumSize" >
<size>
@ -563,7 +563,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">reply to selected message&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="styleSheet" >
<string/>
<string notr="true" />
</property>
<property name="text" >
<string/>
@ -576,7 +576,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="2" >
<item row="1" column="2" >
<widget class="QPushButton" name="forwardmessageButton" >
<property name="minimumSize" >
<size>
@ -601,7 +601,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="3" >
<item row="1" column="3" >
<widget class="QPushButton" name="removemessageButton" >
<property name="minimumSize" >
<size>
@ -622,7 +622,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">remove selected message&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="styleSheet" >
<string/>
<string notr="true" />
</property>
<property name="text" >
<string/>
@ -635,7 +635,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="4" >
<item row="1" column="4" >
<widget class="QPushButton" name="printbutton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
@ -666,12 +666,12 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="5" >
<item row="1" column="5" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>541</width>
<height>20</height>
@ -679,7 +679,7 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item row="1" column="0" colspan="6" >
<item row="2" column="0" colspan="6" >
<widget class="QSplitter" name="splitter_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@ -723,7 +723,8 @@ p, li { white-space: pre-wrap; }
<string>Inbox</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/folder-inbox.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/folder-inbox.png</normaloff>:/images/folder-inbox.png</iconset>
</property>
</item>
<item>
@ -731,7 +732,8 @@ p, li { white-space: pre-wrap; }
<string>Outbox</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/folder-outbox.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/folder-outbox.png</normaloff>:/images/folder-outbox.png</iconset>
</property>
</item>
<item>
@ -739,7 +741,8 @@ p, li { white-space: pre-wrap; }
<string>Draft</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/folder-draft.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
</property>
</item>
<item>
@ -747,7 +750,8 @@ p, li { white-space: pre-wrap; }
<string>Sent</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/folder-sent.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/folder-sent.png</normaloff>:/images/folder-sent.png</iconset>
</property>
</item>
</widget>
@ -779,7 +783,8 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/attachment.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/attachment.png</normaloff>:/images/attachment.png</iconset>
</property>
</column>
<column>
@ -824,7 +829,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeType" >
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@ -874,7 +879,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="1" >
<item row="0" column="2" >
<widget class="QLabel" name="subjectText" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -931,7 +936,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="1" column="2" >
<widget class="QLabel" name="fromText" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -988,7 +993,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="1" >
<item row="2" column="2" >
<widget class="QLabel" name="dateText" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -1045,29 +1050,14 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLabel" name="toText" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>12</height>
</size>
</property>
<item row="3" column="2" >
<widget class="QTextBrowser" name="toText" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>10</height>
<height>22</height>
</size>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
@ -1088,22 +1078,10 @@ p, li { white-space: pre-wrap; }
<layout class="QHBoxLayout" >
<item>
<layout class="QGridLayout" >
<property name="leftMargin" >
<property name="margin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
@ -1145,7 +1123,8 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/edit_remove24.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
</property>
</widget>
</item>
@ -1156,7 +1135,7 @@ p, li { white-space: pre-wrap; }
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>351</width>
<height>20</height>
@ -1176,7 +1155,8 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/down.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
</property>
</widget>
</item>