Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-31 01:33:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/emoticons/emotes.acs
View File

@ -14,7 +14,7 @@
"8-)":"emoticons/cool.png"; "8-)":"emoticons/cool.png";
"=))|:-j|:-J":"emoticons/rotfl.png"; "=))|:-j|:-J":"emoticons/rotfl.png";
"(B)|(b)":"emoticons/beer.png"; "(B)|(b)":"emoticons/beer.png";
"(@)|/cat|/mm":"emoticons/cat.png"; "(@)":"emoticons/cat.png";
"(P)|(p)":"emoticons/camera.png"; "(P)|(p)":"emoticons/camera.png";
"(C)|(c)":"emoticons/coffee.png"; "(C)|(c)":"emoticons/coffee.png";
"*JOKINGLY*|:))|:-))":"emoticons/laugh.png"; "*JOKINGLY*|:))|:-))":"emoticons/laugh.png";

4
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -441,6 +441,7 @@ void MessagesDialog::insertMessages()
case 0: case 0:
default: default:
msgbox = RS_MSG_INBOX; msgbox = RS_MSG_INBOX;
break; break;
} }
@ -471,6 +472,7 @@ void MessagesDialog::insertMessages()
//std::cerr << std::endl; //std::cerr << std::endl;
continue; continue;
} }
/* make a widget per friend */ /* make a widget per friend */
QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0); QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0);
@ -524,7 +526,7 @@ void MessagesDialog::insertMessages()
QFont qf = item->font(i); QFont qf = item->font(i);
qf.setBold(true); qf.setBold(true);
item->setFont(i, qf); item->setFont(i, qf);
item -> setIcon(2, (QIcon(":/images/message-mail.png"))); item -> setIcon(2, (QIcon(":/images/message-mail.png")));
//std::cerr << "Setting Item BOLD!" << std::endl; //std::cerr << "Setting Item BOLD!" << std::endl;
} }

92
retroshare-gui/src/gui/MessagesDialog.ui
View File

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>759</width> <width>759</width>
<height>520</height> <height>557</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -505,7 +505,7 @@
<enum>Qt::DefaultContextMenu</enum> <enum>Qt::DefaultContextMenu</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="1" column="0" >
<widget class="QPushButton" name="newmessageButton" > <widget class="QPushButton" name="newmessageButton" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <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> &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>
<property name="styleSheet" > <property name="styleSheet" >
<string/> <string notr="true" />
</property> </property>
<property name="text" > <property name="text" >
<string/> <string/>
@ -542,7 +542,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="1" column="1" >
<widget class="QPushButton" name="replymessageButton" > <widget class="QPushButton" name="replymessageButton" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <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> &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>
<property name="styleSheet" > <property name="styleSheet" >
<string/> <string notr="true" />
</property> </property>
<property name="text" > <property name="text" >
<string/> <string/>
@ -576,7 +576,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="1" column="2" >
<widget class="QPushButton" name="forwardmessageButton" > <widget class="QPushButton" name="forwardmessageButton" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
@ -601,7 +601,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3" > <item row="1" column="3" >
<widget class="QPushButton" name="removemessageButton" > <widget class="QPushButton" name="removemessageButton" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <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> &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>
<property name="styleSheet" > <property name="styleSheet" >
<string/> <string notr="true" />
</property> </property>
<property name="text" > <property name="text" >
<string/> <string/>
@ -635,7 +635,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4" > <item row="1" column="4" >
<widget class="QPushButton" name="printbutton" > <widget class="QPushButton" name="printbutton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" > <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
@ -666,12 +666,12 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5" > <item row="1" column="5" >
<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>541</width> <width>541</width>
<height>20</height> <height>20</height>
@ -679,7 +679,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0" colspan="6" > <item row="2" column="0" colspan="6" >
<widget class="QSplitter" name="splitter_2" > <widget class="QSplitter" name="splitter_2" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -723,7 +723,8 @@ p, li { white-space: pre-wrap; }
<string>Inbox</string> <string>Inbox</string>
</property> </property>
<property name="icon" > <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> </property>
</item> </item>
<item> <item>
@ -731,7 +732,8 @@ p, li { white-space: pre-wrap; }
<string>Outbox</string> <string>Outbox</string>
</property> </property>
<property name="icon" > <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> </property>
</item> </item>
<item> <item>
@ -739,7 +741,8 @@ p, li { white-space: pre-wrap; }
<string>Draft</string> <string>Draft</string>
</property> </property>
<property name="icon" > <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> </property>
</item> </item>
<item> <item>
@ -747,7 +750,8 @@ p, li { white-space: pre-wrap; }
<string>Sent</string> <string>Sent</string>
</property> </property>
<property name="icon" > <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> </property>
</item> </item>
</widget> </widget>
@ -779,7 +783,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <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> </property>
</column> </column>
<column> <column>
@ -824,7 +829,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeType" > <property name="sizeType" >
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -874,7 +879,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="2" >
<widget class="QLabel" name="subjectText" > <widget class="QLabel" name="subjectText" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -931,7 +936,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="2" >
<widget class="QLabel" name="fromText" > <widget class="QLabel" name="fromText" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -988,7 +993,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="2" >
<widget class="QLabel" name="dateText" > <widget class="QLabel" name="dateText" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -1045,29 +1050,14 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="2" >
<widget class="QLabel" name="toText" > <widget class="QTextBrowser" 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>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>10</height> <height>22</height>
</size> </size>
</property> </property>
<property name="text" >
<string/>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1088,22 +1078,10 @@ p, li { white-space: pre-wrap; }
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<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" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
@ -1145,7 +1123,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <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> </property>
</widget> </widget>
</item> </item>
@ -1156,7 +1135,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>351</width> <width>351</width>
<height>20</height> <height>20</height>
@ -1176,7 +1155,8 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <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> </property>
</widget> </widget>
</item> </item>

33
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -35,6 +35,8 @@
#include "msgs/ChanMsgDialog.h" #include "msgs/ChanMsgDialog.h"
#include "ChatDialog.h" #include "ChatDialog.h"
#include "connect/ConfCertDialog.h" #include "connect/ConfCertDialog.h"
#include "profile/ProfileView.h"
#include "gui/Preferences/rsharesettings.h" #include "gui/Preferences/rsharesettings.h"
@ -65,6 +67,7 @@
#define IMAGE_PEERINFO ":/images/peerdetails_16x16.png" #define IMAGE_PEERINFO ":/images/peerdetails_16x16.png"
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"
#define IMAGE_MSG ":/images/message-mail.png" #define IMAGE_MSG ":/images/message-mail.png"
#define IMAGE_CONNECT ":/images/connect_friend.png"
/* Images for Status icons */ /* Images for Status icons */
#define IMAGE_ONLINE ":/images/user/identity24.png" #define IMAGE_ONLINE ":/images/user/identity24.png"
#define IMAGE_OFFLINE ":/images/user/identityoffline24.png" #define IMAGE_OFFLINE ":/images/user/identityoffline24.png"
@ -139,7 +142,7 @@ PeersDialog::PeersDialog(QWidget *parent)
ui.fontsButton->setIcon(QIcon(QString(":/images/fonts.png"))); ui.fontsButton->setIcon(QIcon(QString(":/images/fonts.png")));
_currentColor = Qt::black; _currentColor = Qt::black;
QPixmap pxm(24,24); QPixmap pxm(16,16);
pxm.fill(_currentColor); pxm.fill(_currentColor);
ui.colorChatButton->setIcon(pxm); ui.colorChatButton->setIcon(pxm);
@ -185,11 +188,14 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
msgAct = new QAction(QIcon(IMAGE_MSG), tr( "Message Friend" ), this ); msgAct = new QAction(QIcon(IMAGE_MSG), tr( "Message Friend" ), this );
connect( msgAct , SIGNAL( triggered() ), this, SLOT( msgfriend() ) ); connect( msgAct , SIGNAL( triggered() ), this, SLOT( msgfriend() ) );
connectfriendAct = new QAction( tr( "Connect To Friend" ), this ); connectfriendAct = new QAction(QIcon(IMAGE_CONNECT), tr( "Connect To Friend" ), this );
connect( connectfriendAct , SIGNAL( triggered() ), this, SLOT( connectfriend() ) ); connect( connectfriendAct , SIGNAL( triggered() ), this, SLOT( connectfriend() ) );
configurefriendAct = new QAction(QIcon(IMAGE_PEERINFO), tr( "Peer Details" ), this ); configurefriendAct = new QAction(QIcon(IMAGE_PEERINFO), tr( "Peer Details" ), this );
connect( configurefriendAct , SIGNAL( triggered() ), this, SLOT( configurefriend() ) ); connect( configurefriendAct , SIGNAL( triggered() ), this, SLOT( configurefriend() ) );
profileviewAct = new QAction(QIcon(IMAGE_PEERINFO), tr( "Profile View" ), this );
connect( profileviewAct , SIGNAL( triggered() ), this, SLOT( viewprofile() ) );
exportfriendAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Export Friend" ), this ); exportfriendAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Export Friend" ), this );
connect( exportfriendAct , SIGNAL( triggered() ), this, SLOT( exportfriend() ) ); connect( exportfriendAct , SIGNAL( triggered() ), this, SLOT( exportfriend() ) );
@ -203,6 +209,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
contextMnu.addAction( msgAct); contextMnu.addAction( msgAct);
contextMnu.addSeparator(); contextMnu.addSeparator();
contextMnu.addAction( configurefriendAct); contextMnu.addAction( configurefriendAct);
//contextMnu.addAction( profileviewAct);
contextMnu.addSeparator(); contextMnu.addSeparator();
contextMnu.addAction( connectfriendAct); contextMnu.addAction( connectfriendAct);
contextMnu.addAction( exportfriendAct); contextMnu.addAction( exportfriendAct);
@ -919,7 +926,7 @@ void PeersDialog::setColor()
QRgb color = QColorDialog::getRgba(ui.lineEdit->textColor().rgba(), &ok, this); QRgb color = QColorDialog::getRgba(ui.lineEdit->textColor().rgba(), &ok, this);
if (ok) { if (ok) {
_currentColor = QColor(color); _currentColor = QColor(color);
QPixmap pxm(24,24); QPixmap pxm(16,16);
pxm.fill(_currentColor); pxm.fill(_currentColor);
ui.colorChatButton->setIcon(pxm); ui.colorChatButton->setIcon(pxm);
} }
@ -1068,3 +1075,23 @@ void PeersDialog::addSmileys()
ui.lineEdit->setText(ui.lineEdit->toHtml() + qobject_cast<QPushButton*>(sender())->toolTip().split("|").first()); ui.lineEdit->setText(ui.lineEdit->toHtml() + qobject_cast<QPushButton*>(sender())->toolTip().split("|").first());
} }
/* GUI stuff -> don't do anything directly with Control */
void PeersDialog::viewprofile()
{
/* display Dialog */
QTreeWidgetItem *c = getCurrentPeer();
static ProfileView *profileview = new ProfileView();
if (!c)
return;
/* set the Id */
std::string id = getPeerRsCertId(c);
profileview -> setPeerId(id);
profileview -> show();
}

74
retroshare-gui/src/gui/PeersDialog.h
View File

@ -17,37 +17,37 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#ifndef _PEERSDIALOG_H #ifndef _PEERSDIALOG_H
#define _PEERSDIALOG_H #define _PEERSDIALOG_H
#include <QFileDialog> #include <QFileDialog>
#include "chat/PopupChatDialog.h" #include "chat/PopupChatDialog.h"
#include "mainpage.h" #include "mainpage.h"
#include "ui_PeersDialog.h" #include "ui_PeersDialog.h"
class QFont; class QFont;
class QAction; class QAction;
class QTextEdit; class QTextEdit;
class QTextCharFormat; class QTextCharFormat;
class ChatDialog; class ChatDialog;
class PeersDialog : public MainPage class PeersDialog : public MainPage
{ {
Q_OBJECT Q_OBJECT
public: public:
/** Default Constructor */ /** Default Constructor */
PeersDialog(QWidget *parent = 0); PeersDialog(QWidget *parent = 0);
/** Default Destructor */ /** Default Destructor */
PopupChatDialog *getPrivateChat(std::string id, std::string name, uint chatflags); PopupChatDialog *getPrivateChat(std::string id, std::string name, uint chatflags);
void clearOldChats(); void clearOldChats();
void loadEmoticonsgroupchat(); void loadEmoticonsgroupchat();
void insertPeers(); void insertPeers();
@ -63,13 +63,13 @@ public slots:
void smileyWidgetgroupchat(); void smileyWidgetgroupchat();
void addSmileys(); void addSmileys();
void on_actionClearChat_triggered(); void on_actionClearChat_triggered();
void displayInfoChatMenu(const QPoint& pos); void displayInfoChatMenu(const QPoint& pos);
private slots: private slots:
/** Create the context popup menu and it's submenus */ /** Create the context popup menu and it's submenus */
void peertreeWidgetCostumPopupMenu( QPoint point ); void peertreeWidgetCostumPopupMenu( QPoint point );
/** Export friend in Friends Dialog */ /** Export friend in Friends Dialog */
@ -80,7 +80,8 @@ private slots:
void chatfriend(); void chatfriend();
void msgfriend(); void msgfriend();
void configurefriend(); void configurefriend();
void viewprofile();
/** RsServer Friend Calls */ /** RsServer Friend Calls */
void allowfriend(); void allowfriend();
@ -99,8 +100,8 @@ private slots:
void getFont(); void getFont();
void underline(); void underline();
private: private:
/* Worker Functions */ /* Worker Functions */
/* (1) Update Display */ /* (1) Update Display */
@ -111,12 +112,13 @@ private:
ChatDialog *chatDialog; ChatDialog *chatDialog;
/** Define the popup menus for the Context menu */ /** Define the popup menus for the Context menu */
QMenu* contextMnu; QMenu* contextMnu;
/** Defines the actions for the context menu */ /** Defines the actions for the context menu */
QAction* chatAct; QAction* chatAct;
QAction* msgAct; QAction* msgAct;
QAction* connectfriendAct; QAction* connectfriendAct;
QAction* profileviewAct;
QAction* configurefriendAct; QAction* configurefriendAct;
QAction* exportfriendAct; QAction* exportfriendAct;
QAction* removefriendAct; QAction* removefriendAct;
@ -124,17 +126,17 @@ private:
QTreeWidget *peertreeWidget; QTreeWidget *peertreeWidget;
QColor _currentColor; QColor _currentColor;
bool _underline; bool _underline;
QHash<QString, QString> smileys; QHash<QString, QString> smileys;
std::map<std::string, PopupChatDialog *> chatDialogs; std::map<std::string, PopupChatDialog *> chatDialogs;
QFont mCurrentFont; /* how the text will come out */ QFont mCurrentFont; /* how the text will come out */
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::PeersDialog ui; Ui::PeersDialog ui;
}; };
#endif #endif

36
retroshare-gui/src/gui/connect/ConnectDialog.ui
View File

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>462</width> <width>462</width>
<height>380</height> <height>475</height>
</rect> </rect>
</property> </property>
<property name="palette" > <property name="palette" >
@ -505,11 +505,31 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>462</width> <width>462</width>
<height>359</height> <height>453</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2" > <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="3" > <item row="0" column="0" colspan="3" >
<widget class="QLabel" name="label_8" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>70</height>
</size>
</property>
<property name="styleSheet" >
<string notr="true" >background-image: url(:/images/addfriendlabel.png)</string>
</property>
<property name="text" >
<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
&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;">
&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:16pt; font-weight:600; color:#000000;"> Make Friend&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3" >
<widget class="QGroupBox" name="groupBox" > <widget class="QGroupBox" name="groupBox" >
<property name="title" > <property name="title" >
<string>Peer Details</string> <string>Peer Details</string>
@ -598,14 +618,14 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_7" > <widget class="QLabel" name="label_7" >
<property name="text" > <property name="text" >
<string>AUTH CODE:</string> <string>AUTH CODE:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="2" column="1" >
<widget class="QLineEdit" name="Ledit_name" > <widget class="QLineEdit" name="Ledit_name" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
@ -615,7 +635,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" > <item row="2" column="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -631,7 +651,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0" colspan="3" > <item row="3" column="0" colspan="3" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
@ -697,9 +717,9 @@
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>359</y> <y>453</y>
<width>462</width> <width>462</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
</widget> </widget>

3
retroshare-gui/src/gui/images.qrc
View File

@ -139,6 +139,7 @@
<file>images/folder-draft24-pressed.png</file> <file>images/folder-draft24-pressed.png</file>
<file>images/folder-draft24.png</file> <file>images/folder-draft24.png</file>
<file>images/folder-inbox.png</file> <file>images/folder-inbox.png</file>
<file>images/folder-inbox-new.png</file>
<file>images/folder-outbox.png</file> <file>images/folder-outbox.png</file>
<file>images/folder-sent.png</file> <file>images/folder-sent.png</file>
<file>images/folder_doments.png</file> <file>images/folder_doments.png</file>
@ -167,6 +168,7 @@
<file>images/informations_24x24.png</file> <file>images/informations_24x24.png</file>
<file>images/invite-friend24.png</file> <file>images/invite-friend24.png</file>
<file>images/invitefriendlabel.png</file> <file>images/invitefriendlabel.png</file>
<file>images/connect_friend.png</file>
<file>images/kbackgammon.png</file> <file>images/kbackgammon.png</file>
<file>images/kblogger.png</file> <file>images/kblogger.png</file>
<file>images/kcmsystem24.png</file> <file>images/kcmsystem24.png</file>
@ -279,6 +281,7 @@
<file>images/user/identity32.png</file> <file>images/user/identity32.png</file>
<file>images/user/add_user16.png</file> <file>images/user/add_user16.png</file>
<file>images/user/personal64.png</file> <file>images/user/personal64.png</file>
<file>images/user/kuser24.png</file>
<file>images/up.png</file> <file>images/up.png</file>
<file>images/underconstruction.png</file> <file>images/underconstruction.png</file>
<file>images/user.png</file> <file>images/user.png</file>

BIN
retroshare-gui/src/gui/images/connect_friend.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

20
retroshare-gui/src/gui/profile/ProfileEdit.ui
View File

@ -10,7 +10,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Profile Edit</string>
</property> </property>
<property name="layoutDirection" > <property name="layoutDirection" >
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
@ -58,7 +58,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="" > <widget class="QWidget" name="layoutWidget" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QLabel" name="label_7" > <widget class="QLabel" name="label_7" >
@ -140,7 +140,8 @@
<string>Add Entry</string> <string>Add Entry</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc" >:/images/add_24x24.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -149,7 +150,7 @@
<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>71</width> <width>71</width>
<height>28</height> <height>28</height>
@ -166,7 +167,8 @@
<string>Move</string> <string>Move</string>
</property> </property>
<property name="icon" > <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> </property>
</widget> </widget>
</item> </item>
@ -176,7 +178,8 @@
<string>Move</string> <string>Move</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc" >:/images/up.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/up.png</normaloff>:/images/up.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -185,7 +188,7 @@
<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>71</width> <width>71</width>
<height>28</height> <height>28</height>
@ -202,7 +205,8 @@
<string>Close Editor</string> <string>Close Editor</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc" >:/images/close_normal.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>

11
retroshare-gui/src/gui/profile/ProfileView.cpp
View File

@ -53,6 +53,8 @@ ProfileView::ProfileView(QWidget *parent)
// connect up the buttons. // connect up the buttons.
connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(closeView())); connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(closeView()));
connect(ui.profileditButton, SIGNAL(clicked()), this, SLOT(profileEdit()));
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -241,7 +243,14 @@ void ProfileView::update()
/* Image Context Menu */ /* Image Context Menu */
void ProfileView::selectimagefile() void ProfileView::selectimagefile()
{ {
return; QString fileName = QFileDialog::getOpenFileName(this, "Load File",
QDir::homePath(),
"Pictures (*.png *.xpm *.jpg)");
if(!fileName.isEmpty())
{
picture = QPixmap(fileName).scaled(108,108, Qt::IgnoreAspectRatio);
ui.photoLabel->setPixmap(picture);
}
} }
void ProfileView::clearimage() void ProfileView::clearimage()

4
retroshare-gui/src/gui/profile/ProfileView.h
View File

@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#ifndef _PROFILE_VIEW_H #ifndef _PROFILE_VIEW_H
@ -76,6 +76,8 @@ private:
std::string pId; std::string pId;
bool mIsOwnId; bool mIsOwnId;
QPixmap picture;
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::ProfileView ui; Ui::ProfileView ui;

410
retroshare-gui/src/gui/profile/ProfileView.ui
View File

@ -10,30 +10,111 @@
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Profile View</string>
</property> </property>
<property name="layoutDirection" > <property name="layoutDirection" >
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2" >
<widget class="QSplitter" name="splitter" > <layout class="QGridLayout" >
<property name="orientation" > <item row="0" column="0" colspan="2" >
<enum>Qt::Vertical</enum> <layout class="QHBoxLayout" >
</property> <item>
<widget class="QWidget" name="" > <widget class="QLabel" name="label_2" >
<layout class="QGridLayout" > <property name="text" >
<item row="0" column="0" colspan="2" > <string>Rs ID</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="idLineEdit" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameLineEdit" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="photoLabel" >
<property name="minimumSize" >
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="styleSheet" >
<string notr="true" >border-image: url(:/images/avatar_background.png);</string>
</property>
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../images.qrc" >:/images/user/personal64.png</pixmap>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="1" colspan="2" >
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Rs ID</string> <string>Last Post:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="idLineEdit" > <widget class="QLineEdit" name="timeLineEdit" >
<property name="readOnly" > <property name="readOnly" >
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -41,184 +122,148 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameLineEdit" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="photoLabel" >
<property name="minimumSize" >
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../images.qrc" >:/images/ddeny.png</pixmap>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="1" colspan="2" >
<layout class="QVBoxLayout" >
<item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Last Post:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="timeLineEdit" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTextEdit" name="postTextEdit" >
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>128</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget" >
<layout class="QVBoxLayout" >
<item> <item>
<widget class="QLabel" name="label_6" > <widget class="QTextEdit" name="postTextEdit" >
<property name="font" > <property name="maximumSize" >
<font> <size>
<weight>75</weight> <width>16777215</width>
<bold>true</bold> <height>128</height>
</font> </size>
</property> </property>
<property name="text" >
<string>Profile</string>
</property>
</widget>
</item>
<item>
<widget class="QTreeWidget" name="profileTreeWidget" >
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<column>
<property name="text" >
<string>Category</string>
</property>
</column>
<column>
<property name="text" >
<string>Thoughts</string>
</property>
</column>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="" > </layout>
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Favourite Files</string>
</property>
</widget>
</item>
<item>
<widget class="QTreeWidget" name="fileTreeWidget" >
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<column>
<property name="text" >
<string>Name</string>
</property>
</column>
<column>
<property name="text" >
<string>Size</string>
</property>
</column>
<column>
<property name="text" >
<string>Hash</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" colspan="2" >
<layout class="QGridLayout" name="gridLayout" >
<property name="horizontalSpacing" >
<number>-1</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_6" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
&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:'Sans Serif'; font-size:9pt; font-weight:600; font-style:normal;">
&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:16pt; vertical-align:sub;">Profile&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="0" column="1" >
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>368</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2" >
<widget class="QToolButton" name="profileditButton" >
<property name="toolTip" >
<string>Edit Profile</string>
</property>
<property name="text" >
<string/>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >
<normaloff>:/images/user/kuser24.png</normaloff>:/images/user/kuser24.png</iconset>
</property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3" >
<widget class="QTreeWidget" name="profileTreeWidget" >
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<column>
<property name="text" >
<string>Category</string>
</property>
</column>
<column>
<property name="text" >
<string>Thoughts</string>
</property>
</column>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2" >
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_5" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Favourite Files</string>
</property>
</widget>
</item>
<item>
<widget class="QTreeWidget" name="fileTreeWidget" >
<property name="contextMenuPolicy" >
<enum>Qt::CustomContextMenu</enum>
</property>
<column>
<property name="text" >
<string>Name</string>
</property>
</column>
<column>
<property name="text" >
<string>Size</string>
</property>
</column>
<column>
<property name="text" >
<string>Hash</string>
</property>
</column>
</widget>
</item>
</layout>
</item>
<item row="3" 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>241</width> <width>241</width>
<height>28</height> <height>28</height>
@ -226,7 +271,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1" > <item row="3" column="1" >
<widget class="QPushButton" name="closeButton" > <widget class="QPushButton" name="closeButton" >
<property name="layoutDirection" > <property name="layoutDirection" >
<enum>Qt::RightToLeft</enum> <enum>Qt::RightToLeft</enum>
@ -235,7 +280,8 @@
<string>Close Profile</string> <string>Close Profile</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc" >:/images/close_normal.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>

75
retroshare-gui/src/gui/toaster/OnlineToaster.ui
View File

@ -5,27 +5,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>330</width> <width>388</width>
<height>168</height> <height>168</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
@ -37,42 +25,18 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="spacing" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="2" > <item row="0" column="2" >
@ -90,7 +54,8 @@
</size> </size>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="../images.qrc" >:/images/close-down.png</iconset> <iconset resource="../images.qrc" >
<normaloff>:/images/close-down.png</normaloff>:/images/close-down.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -108,7 +73,7 @@
<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>225</width> <width>225</width>
<height>22</height> <height>22</height>
@ -126,10 +91,7 @@
<property name="rightMargin" > <property name="rightMargin" >
<number>4</number> <number>4</number>
</property> </property>
<property name="horizontalSpacing" > <property name="spacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item rowspan="3" row="0" column="0" > <item rowspan="3" row="0" column="0" >
@ -147,7 +109,7 @@
</size> </size>
</property> </property>
<property name="styleSheet" > <property name="styleSheet" >
<string>border-image: url(:/images/avatar_background.png);</string> <string notr="true" >border-image: url(:/images/avatar_background.png);</string>
</property> </property>
<property name="text" > <property name="text" >
<string/> <string/>
@ -155,6 +117,9 @@
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="../images.qrc" >:/images/user/personal64.png</pixmap> <pixmap resource="../images.qrc" >:/images/user/personal64.png</pixmap>
</property> </property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
@ -162,7 +127,7 @@
<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>121</width> <width>121</width>
<height>20</height> <height>20</height>
@ -182,7 +147,7 @@
<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>121</width> <width>121</width>
<height>20</height> <height>20</height>
@ -202,7 +167,7 @@
<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>81</width> <width>81</width>
<height>20</height> <height>20</height>
@ -222,7 +187,7 @@
<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>131</width> <width>131</width>
<height>20</height> <height>20</height>
@ -237,7 +202,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>384</width> <width>384</width>
<height>61</height> <height>61</height>