Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-22 06:05:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* set for the Avatar Button a Background image

Browse Source 
* set for Avatar Pictures to use IgnoreAspectRatio

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-07 01:56:09 +00:00
parent e3775fceda
commit 935a52dee3
2 changed files with 86 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -539,7 +539,7 @@ void MessengerWindow::getPicture()
"Pictures (*.png *.xpm *.jpg)"); "Pictures (*.png *.xpm *.jpg)");
if(!fileName.isEmpty()) if(!fileName.isEmpty())
{ {
picture = QPixmap(fileName).scaled(72,72, Qt::KeepAspectRatio); picture = QPixmap(fileName).scaled(53,53, Qt::IgnoreAspectRatio);
ui.avatarButton->setIcon(picture); ui.avatarButton->setIcon(picture);
} }
} }

128
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -13,23 +13,26 @@
<string>RetroShare Messenger</string> <string>RetroShare Messenger</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/rstray3.png</iconset>
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget" > <widget class="QWidget" name="centralwidget" >
<property name="geometry" > <layout class="QGridLayout" >
<rect> <property name="leftMargin" >
<x>0</x>
<y>23</y>
<width>282</width>
<height>511</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2" >
<property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <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>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
@ -40,16 +43,37 @@
<property name="frameShadow" > <property name="frameShadow" >
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QGridLayout" name="gridlayouttop" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>4</number> <number>4</number>
</property> </property>
<property name="spacing" > <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> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
@ -60,9 +84,11 @@ p, li { white-space: pre-wrap; }&#xd;
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&#xd; &lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&#xd;
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Click to change your avatar&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;">Click to change your avatar&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
<property name="styleSheet" >
<string>border-image: url(:/images/mystatus_bg.png);</string>
</property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/retrosharelogo1.png</iconset>
<normaloff>:/images/retrosharelogo1.png</normaloff>:/images/retrosharelogo1.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -76,11 +102,23 @@ p, li { white-space: pre-wrap; }&#xd;
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<layout class="QGridLayout" name="_2" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>4</number> <number>4</number>
</property> </property>
<property name="spacing" > <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> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
@ -109,8 +147,7 @@ p, li { white-space: pre-wrap; }
<string>Online</string> <string>Online</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/donline.png</iconset>
<normaloff>:/images/donline.png</normaloff>:/images/donline.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -118,8 +155,7 @@ p, li { white-space: pre-wrap; }
<string>Busy</string> <string>Busy</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dbusy.png</iconset>
<normaloff>:/images/dbusy.png</normaloff>:/images/dbusy.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -127,8 +163,7 @@ p, li { white-space: pre-wrap; }
<string>Be right Back</string> <string>Be right Back</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dbrb.png</iconset>
<normaloff>:/images/dbrb.png</normaloff>:/images/dbrb.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -136,8 +171,7 @@ p, li { white-space: pre-wrap; }
<string>Away</string> <string>Away</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/daway.png</iconset>
<normaloff>:/images/daway.png</normaloff>:/images/daway.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -145,8 +179,7 @@ p, li { white-space: pre-wrap; }
<string>In a Call</string> <string>In a Call</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dphone.png</iconset>
<normaloff>:/images/dphone.png</normaloff>:/images/dphone.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -154,8 +187,7 @@ p, li { white-space: pre-wrap; }
<string>Out of lunch</string> <string>Out of lunch</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dlunch.png</iconset>
<normaloff>:/images/dlunch.png</normaloff>:/images/dlunch.png</iconset>
</property> </property>
</item> </item>
<item> <item>
@ -163,8 +195,7 @@ p, li { white-space: pre-wrap; }
<string>Apear Offline</string> <string>Apear Offline</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dhidden.png</iconset>
<normaloff>:/images/dhidden.png</normaloff>:/images/dhidden.png</iconset>
</property> </property>
</item> </item>
</widget> </widget>
@ -190,11 +221,23 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<layout class="QGridLayout" name="_3" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
@ -228,8 +271,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" > <iconset resource="images.qrc" >:/images/dadd.png</iconset>
<normaloff>:/images/dadd.png</normaloff>:/images/dadd.png</iconset>
</property> </property>
<property name="iconSize" > <property name="iconSize" >
<size> <size>
@ -265,7 +307,7 @@ p, li { white-space: pre-wrap; }
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>282</width> <width>282</width>
<height>23</height> <height>30</height>
</rect> </rect>
</property> </property>
</widget> </widget>