* redesign PeerDialog and SharedFiles

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-02-06 21:43:43 +00:00
parent 896fc45a22
commit fb39e8d8db
3 changed files with 607 additions and 462 deletions

View File

@ -123,7 +123,13 @@ PeersDialog::PeersDialog(QWidget *parent)
loadEmoticonsgroupchat(); loadEmoticonsgroupchat();
//setWindowIcon(QIcon(QString(":/images/rstray3.png"))); connect(ui.toolButtonchat, SIGNAL(clicked()), this, SLOT(chatfriend()));
connect(ui.toolButtonmessage, SIGNAL(clicked()), this, SLOT(msgfriend()));
connect(ui.toolButtondetails, SIGNAL(clicked()), this, SLOT(connectfriend()));
connect(ui.toolButtonconnect, SIGNAL(clicked()), this, SLOT(configurefriend()));
connect(ui.toolButtonexport, SIGNAL(clicked()), this, SLOT(exportfriend()));
connect(ui.toolButtonremove, SIGNAL(clicked()), this, SLOT(removefriend()));
connect(ui.lineEdit, SIGNAL(textChanged ( ) ), this, SLOT(checkChat( ) )); connect(ui.lineEdit, SIGNAL(textChanged ( ) ), this, SLOT(checkChat( ) ));
connect(ui.Sendbtn, SIGNAL(clicked()), this, SLOT(sendMsg())); connect(ui.Sendbtn, SIGNAL(clicked()), this, SLOT(sendMsg()));

View File

@ -481,157 +481,272 @@
<property name="contextMenuPolicy" > <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_4" >
<item rowspan="3" row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" > <widget class="QTabWidget" name="PeerstabWidget" >
<property name="verticalSpacing" > <property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="currentIndex" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" >
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="images.qrc" >:/images/user/friends24.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:9pt; font-weight:600;">Friends&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>201</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QTreeWidget" name="peertreeWidget" >
<property name="minimumSize" >
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>1677215</width>
<height>16777215</height>
</size>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="acceptDrops" >
<bool>false</bool>
</property>
<property name="autoScroll" >
<bool>false</bool>
</property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
<width>24</width> <width>24</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="itemsExpandable" > <widget class="QWidget" name="friendstab" >
<bool>true</bool> <property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>699</width>
<height>457</height>
</rect>
</property> </property>
<property name="sortingEnabled" > <attribute name="title" >
<bool>true</bool> <string>Friends</string>
</property> </attribute>
<column> <attribute name="icon" >
<property name="text" > <iconset resource="images.qrc" >
<string>#</string> <normaloff>:/images/user/friends24.png</normaloff>:/images/user/friends24.png</iconset>
</property> </attribute>
</column> <layout class="QGridLayout" name="gridLayout_3" >
<column> <property name="bottomMargin" >
<property name="text" >
<string>Status</string>
</property>
</column>
<column>
<property name="text" >
<string>Person</string>
</property>
</column>
</widget>
</item>
</layout>
</item>
<item row="0" column="1" >
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" > <widget class="QFrame" name="friendsframe" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>48</height>
</size>
</property>
<property name="layoutDirection" >
<enum>Qt::LeftToRight</enum>
</property>
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2" >
<property name="topMargin" >
<number>3</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>3</number>
</property>
<property name="horizontalSpacing" >
<number>-1</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QToolButton" name="toolButtonchat" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/chat.png</normaloff>:/images/chat.png</iconset>
</property>
</widget>
</item>
<item row="0" column="1" > <item row="0" column="1" >
<spacer> <widget class="QToolButton" name="toolButtonmessage" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/message-mail.png</normaloff>:/images/message-mail.png</iconset>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QToolButton" name="toolButtondetails" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/peerdetails_16x16.png</normaloff>:/images/peerdetails_16x16.png</iconset>
</property>
</widget>
</item>
<item row="0" column="4" >
<widget class="QToolButton" name="toolButtonexport" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/exportpeers_16x16.png</normaloff>:/images/exportpeers_16x16.png</iconset>
</property>
</widget>
</item>
<item row="0" column="5" >
<widget class="QToolButton" name="toolButtonconnect" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/connect_friend.png</normaloff>:/images/connect_friend.png</iconset>
</property>
</widget>
</item>
<item row="0" column="6" >
<widget class="QToolButton" name="toolButtonremove" >
<property name="minimumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/removefriend16.png</normaloff>:/images/removefriend16.png</iconset>
</property>
</widget>
</item>
<item row="0" column="7" >
<spacer name="horizontalSpacer" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>181</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0" > </layout>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="images.qrc" >:/images/user/agt_forum24.png</pixmap>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item rowspan="2" row="0" column="1" >
<widget class="QLabel" name="label_12" > <widget class="QTabWidget" name="chattabWidget" >
<property name="font" > <property name="font" >
<font> <font>
<pointsize>10</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
<property name="text" > <property name="currentIndex" >
<string>Live Group Chat:</string> <number>0</number>
</property> </property>
</widget> <property name="iconSize" >
</item> <size>
</layout> <width>24</width>
</item> <height>24</height>
</layout> </size>
</item> </property>
<item row="1" column="0" > <widget class="QWidget" name="tab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>416</width>
<height>407</height>
</rect>
</property>
<attribute name="title" >
<string>Live Group Chat</string>
</attribute>
<attribute name="icon" >
<iconset resource="images.qrc" >
<normaloff>:/images/user/agt_forum24.png</normaloff>:/images/user/agt_forum24.png</iconset>
</attribute>
<layout class="QGridLayout" name="gridLayout" >
<property name="bottomMargin" >
<number>3</number>
</property>
<item row="0" column="0" >
<widget class="QTextBrowser" name="msgText" > <widget class="QTextBrowser" name="msgText" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@ -650,9 +765,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="0" >
</item>
<item row="1" column="1" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
@ -661,7 +774,7 @@ p, li { white-space: pre-wrap; }
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>321</width> <width>321</width>
<height>20</height> <height>20</height>
@ -690,7 +803,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/edit-italic.png</iconset> <iconset resource="images.qrc" >
<normaloff>:/images/edit-italic.png</normaloff>:/images/edit-italic.png</iconset>
</property> </property>
<property name="checkable" > <property name="checkable" >
<bool>true</bool> <bool>true</bool>
@ -718,7 +832,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/edit-underline.png</iconset> <iconset resource="images.qrc" >
<normaloff>:/images/edit-underline.png</normaloff>:/images/edit-underline.png</iconset>
</property> </property>
<property name="checkable" > <property name="checkable" >
<bool>true</bool> <bool>true</bool>
@ -746,7 +861,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/edit-bold.png</iconset> <iconset resource="images.qrc" >
<normaloff>:/images/edit-bold.png</normaloff>:/images/edit-bold.png</iconset>
</property> </property>
<property name="checkable" > <property name="checkable" >
<bool>true</bool> <bool>true</bool>
@ -815,7 +931,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/emoticons/kopete/kopete020.png</iconset> <iconset resource="images.qrc" >
<normaloff>:/images/emoticons/kopete/kopete020.png</normaloff>:/images/emoticons/kopete/kopete020.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -876,14 +993,14 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="1" > <item row="2" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>321</width> <width>321</width>
<height>20</height> <height>20</height>
@ -901,6 +1018,72 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</item> </item>
</layout> </layout>
</widget>
</widget>
</item>
<item row="1" column="0" >
<widget class="QTreeWidget" name="peertreeWidget" >
<property name="minimumSize" >
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>1677215</width>
<height>16777215</height>
</size>
</property>
<property name="font" >
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="acceptDrops" >
<bool>false</bool>
</property>
<property name="autoScroll" >
<bool>false</bool>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="itemsExpandable" >
<bool>true</bool>
</property>
<property name="sortingEnabled" >
<bool>true</bool>
</property>
<column>
<property name="text" >
<string>#</string>
</property>
</column>
<column>
<property name="text" >
<string>Status</string>
</property>
</column>
<column>
<property name="text" >
<string>Person</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
<action name="actionClearChat" > <action name="actionClearChat" >
<property name="text" > <property name="text" >
<string>Clear Chat History</string> <string>Clear Chat History</string>

View File

@ -5,7 +5,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>548</width> <width>578</width>
<height>433</height> <height>433</height>
</rect> </rect>
</property> </property>
@ -487,72 +487,17 @@
<property name="contextMenuPolicy" > <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3" > <layout class="QGridLayout" name="gridLayout" >
<property name="spacing" > <property name="bottomMargin" >
<number>0</number> <number>3</number>
</property> </property>
<item row="0" column="0" colspan="2" > <property name="horizontalSpacing" >
<layout class="QHBoxLayout" > <number>-1</number>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property> </property>
<property name="spacing" > <property name="verticalSpacing" >
<number>6</number> <number>3</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" colspan="4" >
<widget class="QLabel" name="label" >
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="images.qrc" >:/images/fileshare16.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:9pt; font-weight:600;">Files&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>271</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="checkButton" >
<property name="text" >
<string>check files</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hashLabel" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QTabWidget" name="filestabWidget" > <widget class="QTabWidget" name="filestabWidget" >
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>0</number>
@ -562,8 +507,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>526</width> <width>556</width>
<height>322</height> <height>355</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -573,13 +518,10 @@ p, li { white-space: pre-wrap; }
<iconset resource="images.qrc" > <iconset resource="images.qrc" >
<normaloff>:/images/fileshare16.png</normaloff>:/images/fileshare16.png</iconset> <normaloff>:/images/fileshare16.png</normaloff>:/images/fileshare16.png</iconset>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout_3" >
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" >
<number>0</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QTreeView" name="remoteDirTreeView" > <widget class="QTreeView" name="remoteDirTreeView" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -618,8 +560,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>526</width> <width>556</width>
<height>300</height> <height>347</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -671,7 +613,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="1" column="0" >
<widget class="QPushButton" name="downloadButton" > <widget class="QPushButton" name="downloadButton" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
@ -697,7 +639,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="1" column="1" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -710,6 +652,20 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2" >
<widget class="QPushButton" name="checkButton" >
<property name="text" >
<string>check files</string>
</property>
</widget>
</item>
<item row="1" column="3" >
<widget class="QLabel" name="hashLabel" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>