Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

-replaced MessageToaster with OnlineToaster for POPUP_CONNECT

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@672 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-08 19:47:50 +00:00
parent 2ac326f076
commit 074e4adbf3
7 changed files with 55 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/RetroShare.pro
View file

@ -124,6 +124,7 @@ HEADERS += rshare.h \
gui/Preferences/ServerDialog.h \ gui/Preferences/ServerDialog.h \
gui/Preferences/ConfirmQuitDialog.h \ gui/Preferences/ConfirmQuitDialog.h \
gui/toaster/MessageToaster.h \ gui/toaster/MessageToaster.h \
gui/toaster/OnlineToaster.h \
gui/toaster/ChatToaster.h \ gui/toaster/ChatToaster.h \
gui/toaster/CallToaster.h \ gui/toaster/CallToaster.h \
gui/toaster/QtToaster.h \ gui/toaster/QtToaster.h \
@ -226,6 +227,7 @@ FORMS += gui/ChatDialog.ui \
gui/toaster/CallToaster.ui \ gui/toaster/CallToaster.ui \
gui/toaster/ChatToaster.ui \ gui/toaster/ChatToaster.ui \
gui/toaster/MessageToaster.ui \ gui/toaster/MessageToaster.ui \
gui/toaster/OnlineToaster.ui \
gui/Settings/settings.ui \ gui/Settings/settings.ui \
gui/Settings/GeneralPage.ui \ gui/Settings/GeneralPage.ui \
gui/Settings/DirectoriesPage.ui \ gui/Settings/DirectoriesPage.ui \
@ -344,6 +346,7 @@ SOURCES += main.cpp \
gui/toaster/ChatToaster.cpp \ gui/toaster/ChatToaster.cpp \
gui/toaster/MessageToaster.cpp \ gui/toaster/MessageToaster.cpp \
gui/toaster/CallToaster.cpp \ gui/toaster/CallToaster.cpp \
gui/toaster/OnlineToaster.cpp \
gui/toaster/QtToaster.cpp \ gui/toaster/QtToaster.cpp \
gui/authdlg/AuthorizationDialog.cpp \ gui/authdlg/AuthorizationDialog.cpp \
gui/advsearch/advancedsearchdialog.cpp \ gui/advsearch/advancedsearchdialog.cpp \

1
retroshare-gui/src/gui/images.qrc
View file

@ -242,6 +242,7 @@
<file>images/user/identityoffline24.png</file> <file>images/user/identityoffline24.png</file>
<file>images/user/identitylightgrey24.png</file> <file>images/user/identitylightgrey24.png</file>
<file>images/user/agt_forum24.png</file> <file>images/user/agt_forum24.png</file>
<file>images/user/identity32.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/toaster/toaster-backrs4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

2
retroshare-gui/src/gui/toaster/OnlineToaster.cpp
View file

@ -46,7 +46,7 @@ OnlineToaster::~OnlineToaster() {
} }
void OnlineToaster::setMessage(const QString & message) { void OnlineToaster::setMessage(const QString & message) {
_ui->messageButton->setText(message); _ui->messageLabel->setText(message);
} }
void OnlineToaster::setPixmap(const QPixmap & pixmap) { void OnlineToaster::setPixmap(const QPixmap & pixmap) {

106
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>370</width> <width>388</width>
<height>221</height> <height>221</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" >
@ -36,43 +24,19 @@
<property name="frameShadow" > <property name="frameShadow" >
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_2" >
<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>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="margin" >
<number>0</number>
</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>
@ -120,26 +85,32 @@
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="spacing" >
<number>0</number>
</property>
<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="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size> <size>
<width>121</width> <width>121</width>
<height>61</height> <height>48</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="pixmaplabel" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap resource="../images.qrc" >:/images/kdmconfig.png</pixmap> <pixmap resource="../images.qrc" >:/images/user/identity32.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -148,10 +119,13 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size> <size>
<width>111</width> <width>111</width>
<height>71</height> <height>48</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -159,16 +133,19 @@
</layout> </layout>
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" > <property name="horizontalSpacing" >
<number>6</number>
</property>
<item rowspan="2" 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>137</width> <width>137</width>
<height>41</height> <height>58</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -180,19 +157,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item rowspan="2" row="0" column="2" >
<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>136</width> <width>136</width>
<height>31</height> <height>58</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1" >
<widget class="QLabel" name="messageLabel" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="3" column="0" > <item row="3" column="0" >
@ -200,7 +184,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>368</width> <width>368</width>
<height>61</height> <height>61</height>

2
retroshare-gui/src/gui/toaster/QtToaster.cpp
View file

@ -39,7 +39,7 @@ QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame)
WidgetBackgroundImage::setBackgroundImage(toasterWindowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize); WidgetBackgroundImage::setBackgroundImage(toasterWindowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize);
_toaster->resize(181, 116); _toaster->resize(184, 128);
} }
void QtToaster::setTimeOnTop(unsigned time) { void QtToaster::setTimeOnTop(unsigned time) {

7
retroshare-gui/src/rsiface/notifyqt.cpp
View file

@ -13,6 +13,7 @@
#include "gui/ChannelsDialog.h" #include "gui/ChannelsDialog.h"
#include "gui/MessengerWindow.h" #include "gui/MessengerWindow.h"
#include "gui/toaster/OnlineToaster.h"
#include "gui/toaster/MessageToaster.h" #include "gui/toaster/MessageToaster.h"
#include "gui/toaster/ChatToaster.h" #include "gui/toaster/ChatToaster.h"
#include "gui/toaster/CallToaster.h" #include "gui/toaster/CallToaster.h"
@ -213,9 +214,9 @@ static time_t lastTs = 0;
default: default:
case RS_POPUP_CONNECT: case RS_POPUP_CONNECT:
{ {
MessageToaster * msgToaster = new MessageToaster(); OnlineToaster * onlineToaster = new OnlineToaster();
msgToaster->setMessage(QString::fromStdString(realmsg)); onlineToaster->setMessage(QString::fromStdString(realmsg));
msgToaster->show(); onlineToaster->show();
} }
break; break;
} }