Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed the layout of all Toasters to look like same

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-12-10 02:37:58 +00:00
parent e0a2883eaf
commit 224a44f79c
16 changed files with 238 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,7 @@
<file>images/filerating5.png</file>
<file>images/fileshare16.png</file>
<file>images/fileshare24.png</file>
<file>images/fileshare32.png</file>
<file>images/fileshare48.png</file>
<file>images/find.png</file>
<file>images/find-16.png</file>
@ -422,9 +423,7 @@
<file>images/toaster/chat.png</file>
<file>images/toaster/hangup.png</file>
<file>images/toaster/pickup.png</file>
<file>images/toaster/toaster-background.png</file>
<file>images/toaster/toaster-backrs3.png</file>
<file>images/toaster/toaster-backrs4.png</file>
<file>images/toaster/backgroundtoaster.png</file>
<file>images/thumb-default-video.png</file>
<file>images/user/add_user24.png</file>
<file>images/user/add_user48.png</file>

BIN
retroshare-gui/src/gui/images/toaster/backgroundtoaster.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
retroshare-gui/src/gui/images/toaster/backgroundtoasterblue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backclear.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 804 B

BIN
retroshare-gui/src/gui/images/toaster/toaster-background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backgroundrs.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backrs1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backrs2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backrs3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backrs4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
retroshare-gui/src/gui/images/toaster/toaster-backrs5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

26
retroshare-gui/src/gui/toaster/DownloadToaster.ui
View File

@ -140,9 +140,9 @@
<widget class="QLabel" name="lblTitle">
<property name="geometry">
<rect>
<x>28</x>
<y>1</y>
<width>248</width>
<x>30</x>
<y>10</y>
<width>241</width>
<height>20</height>
</rect>
</property>
@ -154,23 +154,26 @@
<property name="geometry">
<rect>
<x>4</x>
<y>3</y>
<width>16</width>
<height>16</height>
<y>10</y>
<width>21</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/accepted16.png</pixmap>
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="spbClose">
<property name="geometry">
<rect>
<x>279</x>
<y>1</y>
<x>270</x>
<y>10</y>
<width>20</width>
<height>20</height>
</rect>
@ -205,7 +208,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/finished_background.png</pixmap>
<pixmap resource="../images.qrc">:/images/toaster/backgroundtoaster.png</pixmap>
</property>
</widget>
<zorder>label_2</zorder>
@ -221,6 +224,9 @@
</tabstops>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

2
retroshare-gui/src/gui/toaster/MessageToaster.cpp
View File

@ -27,7 +27,7 @@ MessageToaster::MessageToaster(const QString &name, const QString &title, const
/* connect buttons */
connect(ui.closebtn, SIGNAL(clicked()), this, SLOT(hide()));
connect(ui.openmessagebtn, SIGNAL(clicked()), this, SLOT(openmessageClicked()));
//connect(ui.openmessagebtn, SIGNAL(clicked()), this, SLOT(openmessageClicked()));
connect(ui.openmessagetoolButton, SIGNAL(clicked()), this, SLOT(openmessageClicked()));
/* set informations */

261
retroshare-gui/src/gui/toaster/MessageToaster.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>304</width>
<height>125</height>
<width>300</width>
<height>100</height>
</rect>
</property>
<property name="minimumSize">
@ -25,28 +25,41 @@
<property name="windowTitle">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QFrame#frame{
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 2px solid #CCCCCC;}</string>
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<widget class="QLabel" name="namelabel">
<property name="geometry">
<rect>
<x>150</x>
<y>0</y>
<width>16</width>
<height>16</height>
</rect>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<property name="text">
<string/>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>300</width>
<height>100</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/toaster/backgroundtoaster.png</pixmap>
</property>
</widget>
<widget class="QToolButton" name="openmessagetoolButton">
<property name="geometry">
<rect>
@ -79,28 +92,68 @@ border: 2px solid #CCCCCC;}</string>
<bool>true</bool>
</property>
</widget>
<widget class="QLineEdit" name="subjectline">
<property name="enabled">
<bool>false</bool>
</property>
<widget class="QLabel" name="lblTitle">
<property name="geometry">
<rect>
<x>70</x>
<y>30</y>
<width>211</width>
<x>40</x>
<y>10</y>
<width>221</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>&lt;b&gt;1 new Message from&lt;/b&gt;</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>16</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QToolButton" name="closebtn">
<property name="geometry">
<rect>
<x>270</x>
<y>10</y>
<width>20</width>
<height>20</height>
</rect>
</property>
<property name="autoFillBackground">
<bool>false</bool>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="styleSheet">
<string notr="true">background-color: transparent;
border: none;
color: black;</string>
<property name="toolTip">
<string>Close</string>
</property>
<property name="accessibleName">
<string notr="true">Close button</string>
</property>
<property name="accessibleDescription">
<string notr="true">Close the information dialog</string>
</property>
<property name="text">
<string>Subject</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/closenormal.png</normaloff>:/images/closenormal.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QTextBrowser" name="contentBrowser">
@ -109,10 +162,10 @@ color: black;</string>
</property>
<property name="geometry">
<rect>
<x>70</x>
<x>80</x>
<y>50</y>
<width>191</width>
<height>60</height>
<width>201</width>
<height>41</height>
</rect>
</property>
<property name="autoFillBackground">
@ -136,139 +189,41 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Message&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QToolButton" name="openmessagebtn">
<widget class="QLineEdit" name="subjectline">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>260</x>
<y>60</y>
<width>31</width>
<height>31</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Play video</string>
</property>
<property name="whatsThis">
<string/>
</property>
<property name="accessibleName">
<string>Play button</string>
</property>
<property name="accessibleDescription">
<string>Play the downloaded video</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/evolution.png</normaloff>:/images/evolution.png</iconset>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</widget>
</item>
</layout>
<widget class="QLabel" name="lblTitle">
<property name="geometry">
<rect>
<x>28</x>
<y>1</y>
<width>121</width>
<x>80</x>
<y>30</y>
<width>201</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>&lt;b&gt;1 new Message from&lt;/b&gt;</string>
<property name="autoFillBackground">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>4</x>
<y>3</y>
<width>16</width>
<height>16</height>
</rect>
<property name="styleSheet">
<string notr="true">background-color: transparent;
border: none;
color: black;</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
<string>Subject</string>
</property>
</widget>
<widget class="QToolButton" name="closebtn">
<property name="geometry">
<rect>
<x>279</x>
<y>1</y>
<width>20</width>
<height>20</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Close</string>
</property>
<property name="accessibleName">
<string notr="true">Close button</string>
</property>
<property name="accessibleDescription">
<string notr="true">Close the information dialog</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="namelabel">
<property name="geometry">
<rect>
<x>150</x>
<y>0</y>
<width>111</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
<zorder>frame</zorder>
<zorder>lblTitle</zorder>
<zorder>label</zorder>
<zorder>closebtn</zorder>
<zorder>namelabel</zorder>
</widget>
<tabstops>
<tabstop>openmessagebtn</tabstop>
<tabstop>closebtn</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

4
retroshare-gui/src/gui/toaster/OnlineToaster.cpp
View File

@ -39,8 +39,8 @@ OnlineToaster::OnlineToaster(const std::string &peerId, const QString &name, con
ui.messageLabel->setText(name);
ui.pixmaplabel->setPixmap(avatar);
WidgetBackgroundImage::setBackgroundImage(ui.windowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize);
resize(184, 128);
WidgetBackgroundImage::setBackgroundImage(ui.windowFrame, ":images/toaster/backgroundtoaster.png", WidgetBackgroundImage::AdjustSize);
resize(300, 100);
play();
}

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

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>388</width>
<height>168</height>
<width>300</width>
<height>100</height>
</rect>
</property>
<layout class="QGridLayout">
@ -20,7 +20,7 @@
<item row="0" column="0">
<widget class="QFrame" name="windowFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
@ -34,13 +34,25 @@
</property>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="2">
<item row="0" column="3">
<widget class="QPushButton" name="closeButton">
<property name="minimumSize">
<size>
@ -56,7 +68,7 @@
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/close-down.png</normaloff>:/images/close-down.png</iconset>
<normaloff>:/images/closenormal.png</normaloff>:/images/closenormal.png</iconset>
</property>
<property name="iconSize">
<size>
@ -69,50 +81,99 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>225</width>
<width>20</width>
<height>22</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>RetroShare</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
<number>4</number>
<number>6</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>4</number>
<number>6</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0" rowspan="3">
<property name="horizontalSpacing">
<number>9</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="1" column="1" rowspan="2">
<widget class="QLabel" name="messageLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="4">
<widget class="QLabel" name="pixmaplabel">
<property name="minimumSize">
<size>
<width>74</width>
<height>74</height>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>74</width>
<height>74</height>
<width>70</width>
<height>70</height>
</size>
</property>
<property name="styleSheet">
@ -133,19 +194,6 @@ border-radius: 4px;}
</widget>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>121</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="messageButton">
<property name="font">
<font>
@ -161,15 +209,15 @@ border-radius: 4px;}
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>121</width>
<height>20</height>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
@ -177,54 +225,14 @@ border-radius: 4px;}
</layout>
</item>
<item row="2" column="0">
<layout class="QGridLayout">
<property name="topMargin">
<number>6</number>
</property>
<item row="0" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>81</width>
<height>18</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QLabel" name="messageLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>131</width>
<height>18</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="3" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>384</width>
<height>61</height>
<width>100</width>
<height>40</height>
</size>
</property>
</spacer>
@ -235,14 +243,11 @@ border-radius: 4px;}
</layout>
</widget>
<tabstops>
<tabstop>messageButton</tabstop>
<tabstop>closeButton</tabstop>
</tabstops>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>