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

- Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application

Browse source 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-24 23:26:04 +00:00
parent 6792348402
commit d20ce41c96
37 changed files with 82 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/FileTransfer/DetailsDialog.ui
View file

@ -13,19 +13,15 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Details</string> <string>Details</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabGeneral"> <widget class="QWidget" name="tabGeneral">
<attribute name="icon"> <attribute name="icon">
<iconset resource="images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/blockdevice.png</normaloff>:/images/blockdevice.png</iconset> <normaloff>:/images/blockdevice.png</normaloff>:/images/blockdevice.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -45,7 +41,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="images.qrc">:/images/graph-downloaded.png</pixmap> <pixmap resource="../images.qrc">:/images/graph-downloaded.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -66,7 +62,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="images.qrc">:/images/graph-downloading.png</pixmap> <pixmap resource="../images.qrc">:/images/graph-downloading.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -87,7 +83,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="images.qrc">:/images/graph-notdownload.png</pixmap> <pixmap resource="../images.qrc">:/images/graph-notdownload.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -121,7 +117,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="images.qrc">:/images/graph-checking.png</pixmap> <pixmap resource="../images.qrc">:/images/graph-checking.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -199,7 +195,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="images.qrc"/> <include location="../images.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

8
retroshare-gui/src/gui/FileTransfer/TurtleRouterDialog.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Router Statistics</string> <string>Router Statistics</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeWidget" name="_f2f_TW"> <widget class="QTreeWidget" name="_f2f_TW">
@ -32,8 +28,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

8
retroshare-gui/src/gui/FileTransfer/TurtleRouterStatistics.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Router Statistics</string> <string>Router Statistics</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
@ -48,8 +44,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

9
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -1045,9 +1045,11 @@ void SetForegroundWindowInternal(HWND hWnd)
return _instance->linksDialog; return _instance->linksDialog;
#endif #endif
case Channels: case Channels:
return _instance->gxschannelDialog; return _instance->gxschannelDialog;
case Forums: case Forums:
return _instance->gxsforumDialog; return _instance->gxsforumDialog;
case Posted:
return _instance->postedDialog;
#ifdef BLOGS #ifdef BLOGS
case Blogs: case Blogs:
return _instance->blogsFeed; return _instance->blogsFeed;
@ -1452,7 +1454,6 @@ void MainWindow::externalLinkActivated(const QUrl &url)
if(!already_warned) if(!already_warned)
{ {
QMessageBox mb(QObject::tr("Confirmation"), QObject::tr("Do you want this link to be handled by your system?")+"<br/><br/>"+ url.toString()+"<br/><br/>"+tr("Make sure this link has not been forged to drag you to a malicious website."), QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0); QMessageBox mb(QObject::tr("Confirmation"), QObject::tr("Do you want this link to be handled by your system?")+"<br/><br/>"+ url.toString()+"<br/><br/>"+tr("Make sure this link has not been forged to drag you to a malicious website."), QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0);
mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
QCheckBox *checkbox = new QCheckBox(tr("Don't ask me again")) ; QCheckBox *checkbox = new QCheckBox(tr("Don't ask me again")) ;
mb.layout()->addWidget(checkbox) ; mb.layout()->addWidget(checkbox) ;
@ -1475,13 +1476,11 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
// QUrl can't handle the old RetroShare link format properly // QUrl can't handle the old RetroShare link format properly
if (url.host().isEmpty()) { if (url.host().isEmpty()) {
QMessageBox mb("RetroShare", tr("It seems to be an old RetroShare link. Please use copy instead."), QMessageBox::Critical, QMessageBox::Ok, 0, 0); QMessageBox mb("RetroShare", tr("It seems to be an old RetroShare link. Please use copy instead."), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();
return; return;
} }
QMessageBox mb("RetroShare", tr("The file link is malformed."), QMessageBox::Critical, QMessageBox::Ok, 0, 0); QMessageBox mb("RetroShare", tr("The file link is malformed."), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();
return; return;
} }

4
retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Album</string> <string>Album</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>

4
retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>PhotoShare</string> <string>PhotoShare</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>

4
retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
View file

@ -58,12 +58,12 @@ uint32_t PostedEditEnabledFlags = PostedCreateEnabledFlags;
uint32_t PostedEditDefaultsFlags = PostedCreateDefaultsFlags; uint32_t PostedEditDefaultsFlags = PostedCreateDefaultsFlags;
PostedGroupDialog::PostedGroupDialog(TokenQueue *tokenQueue, QWidget *parent) PostedGroupDialog::PostedGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, PostedCreateEnabledFlags, PostedCreateDefaultsFlags, parent) : GxsGroupDialog(tokenQueue, PostedCreateEnabledFlags, PostedCreateDefaultsFlags, parent)
{ {
} }
PostedGroupDialog::PostedGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent) PostedGroupDialog::PostedGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent)
:GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, PostedEditEnabledFlags, PostedEditDefaultsFlags, parent) : GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, PostedEditEnabledFlags, PostedEditDefaultsFlags, parent)
{ {
} }

3
retroshare-gui/src/gui/Posted/PostedGroupDialog.h
View file

@ -41,9 +41,6 @@ protected:
virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta); virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description); virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta); virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
private:
RsPostedGroup mTopic;
}; };
#endif #endif

4
retroshare-gui/src/gui/QuickStartWizard2.ui
View file

@ -28,10 +28,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Quick Start Wizard</string> <string>Quick Start Wizard</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>

2
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -1056,7 +1056,6 @@ static void processList(const QStringList &list, const QString &textSingular, co
question += "<br><br>" + content + "</body></html>"; question += "<br><br>" + content + "</body></html>";
QMessageBox mb(QObject::tr("Confirmation"), question, QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0); QMessageBox mb(QObject::tr("Confirmation"), question, QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0);
mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
if (mb.exec() == QMessageBox::No) { if (mb.exec() == QMessageBox::No) {
return 0; return 0;
} }
@ -1497,7 +1496,6 @@ static void processList(const QStringList &list, const QString &textSingular, co
if (result.isEmpty() == false) { if (result.isEmpty() == false) {
QMessageBox mb(QObject::tr("Result"), "<html><body>" + result + "</body></html>", QMessageBox::Information, QMessageBox::Ok, 0, 0); QMessageBox mb(QObject::tr("Result"), "<html><body>" + result + "</body></html>", QMessageBox::Information, QMessageBox::Ok, 0, 0);
mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
mb.exec(); mb.exec();
} }

4
retroshare-gui/src/gui/ServicePermissionDialog.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Service permissions</string> <string>Service permissions</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>

1
retroshare-gui/src/gui/chat/ChatDialog.cpp
View file

@ -256,7 +256,6 @@ void ChatDialog::init(const RsPeerId &peerId, const QString &title)
// more than one ssl ids online or all offline // more than one ssl ids online or all offline
QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one locations.\nPlease choose one of it to chat with."), QMessageBox::Ok); QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one locations.\nPlease choose one of it to chat with."), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();
} else { } else {
getChat(peerId, forceFocus ? RS_CHAT_OPEN | RS_CHAT_FOCUS : RS_CHAT_OPEN); getChat(peerId, forceFocus ? RS_CHAT_OPEN | RS_CHAT_FOCUS : RS_CHAT_OPEN);

1
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -266,7 +266,6 @@ void ChatLobbyDialog::changeNickname()
QInputDialog dialog; QInputDialog dialog;
dialog.setWindowTitle(tr("Change nick name")); dialog.setWindowTitle(tr("Change nick name"));
dialog.setLabelText(tr("Please enter your new nick name")); dialog.setLabelText(tr("Please enter your new nick name"));
dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
std::string nickName; std::string nickName;
rsMsgs->getNickNameForChatLobby(lobbyId, nickName); rsMsgs->getNickNameForChatLobby(lobbyId, nickName);

1
retroshare-gui/src/gui/chat/ChatTabWidget.cpp
View file

@ -26,7 +26,6 @@
#include "gui/common/StatusDefs.h" #include "gui/common/StatusDefs.h"
#include "rshare.h" #include "rshare.h"
#define IMAGE_WINDOW ":/images/rstray3.png"
#define IMAGE_TYPING ":/images/typing.png" #define IMAGE_TYPING ":/images/typing.png"
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"

6
retroshare-gui/src/gui/chat/PopupChatWindow.cpp
View file

@ -35,7 +35,7 @@
#include <retroshare/rsmsgs.h> #include <retroshare/rsmsgs.h>
#include <retroshare/rsnotify.h> #include <retroshare/rsnotify.h>
#define IMAGE_WINDOW ":/images/rstray3.png"
#define IMAGE_TYPING ":/images/typing.png" #define IMAGE_TYPING ":/images/typing.png"
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"
@ -100,8 +100,6 @@ PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WindowFlags f
/* signal toggled is called */ /* signal toggled is called */
ui.actionSetOnTop->setChecked(Settings->valueFromGroup("ChatWindow", "OnTop", false).toBool()); ui.actionSetOnTop->setChecked(Settings->valueFromGroup("ChatWindow", "OnTop", false).toBool());
} }
setWindowIcon(QIcon(IMAGE_WINDOW));
} }
/** Destructor. */ /** Destructor. */
@ -285,7 +283,7 @@ void PopupChatWindow::calculateTitle(ChatDialog *dialog)
if (cd && cd->hasPeerStatus()) { if (cd && cd->hasPeerStatus()) {
icon = QIcon(StatusDefs::imageIM(cd->getPeerStatus())); icon = QIcon(StatusDefs::imageIM(cd->getPeerStatus()));
} else { } else {
icon = QIcon(IMAGE_WINDOW); icon = qApp->windowIcon();
} }
} }

1
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -134,7 +134,6 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
smWidget->setAttribute( Qt::WA_DeleteOnClose); smWidget->setAttribute( Qt::WA_DeleteOnClose);
smWidget->setWindowTitle("Emoticons"); smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setBaseSize(countPerLine*buttonWidth, rowCount*buttonHeight); smWidget->setBaseSize(countPerLine*buttonWidth, rowCount*buttonHeight);
//Warning: this part of code was taken from kadu instant messenger; //Warning: this part of code was taken from kadu instant messenger;

1
retroshare-gui/src/gui/common/RsCollectionFile.cpp
View file

@ -205,7 +205,6 @@ void RsCollectionFile::recursAddElements(QDomDocument& doc,const ColFileInfo& co
static void showErrorBox(const QString& fileName, const QString& error) static void showErrorBox(const QString& fileName, const QString& error)
{ {
QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok); QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();
} }

83
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View file

@ -37,26 +37,26 @@
#include <iostream> #include <iostream>
// Control of Publish Signatures. // Control of Publish Signatures.
#define RSGXS_GROUP_SIGN_PUBLISH_MASK 0x000000ff #define RSGXS_GROUP_SIGN_PUBLISH_MASK 0x000000ff
#define RSGXS_GROUP_SIGN_PUBLISH_ENCRYPTED 0x00000001 #define RSGXS_GROUP_SIGN_PUBLISH_ENCRYPTED 0x00000001
#define RSGXS_GROUP_SIGN_PUBLISH_ALLSIGNED 0x00000002 #define RSGXS_GROUP_SIGN_PUBLISH_ALLSIGNED 0x00000002
#define RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD 0x00000004 #define RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD 0x00000004
#define RSGXS_GROUP_SIGN_PUBLISH_NONEREQ 0x00000008 #define RSGXS_GROUP_SIGN_PUBLISH_NONEREQ 0x00000008
// Author Signature. // Author Signature.
#define RSGXS_GROUP_SIGN_AUTHOR_MASK 0x0000ff00 #define RSGXS_GROUP_SIGN_AUTHOR_MASK 0x0000ff00
#define RSGXS_GROUP_SIGN_AUTHOR_GPG 0x00000100 #define RSGXS_GROUP_SIGN_AUTHOR_GPG 0x00000100
#define RSGXS_GROUP_SIGN_AUTHOR_REQUIRED 0x00000200 #define RSGXS_GROUP_SIGN_AUTHOR_REQUIRED 0x00000200
#define RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN 0x00000400 #define RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN 0x00000400
#define RSGXS_GROUP_SIGN_AUTHOR_NONE 0x00000800 #define RSGXS_GROUP_SIGN_AUTHOR_NONE 0x00000800
#define GXSGROUP_NEWGROUPID 1 #define GXSGROUP_NEWGROUPID 1
#define GXSGROUP_LOADGROUP 2 #define GXSGROUP_LOADGROUP 2
#define GXSGROUP_INTERNAL_LOADGROUP 3 #define GXSGROUP_INTERNAL_LOADGROUP 3
/** Constructor */ /** Constructor */
GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent) GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent)
: QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), mTokenService(NULL), mExternalTokenQueue(tokenExternalQueue), mInternalTokenQueue(NULL), mGrpMeta(), mMode(MODE_CREATE), mEnabledFlags(enableFlags), mReadonlyFlags(0), mDefaultsFlags(defaultFlags) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), mTokenService(NULL), mExternalTokenQueue(tokenExternalQueue), mInternalTokenQueue(NULL), mGrpMeta(), mMode(MODE_CREATE), mEnabledFlags(enableFlags), mReadonlyFlags(0), mDefaultsFlags(defaultFlags)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
@ -67,7 +67,7 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, uint32_t enableFl
} }
GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent) GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent)
: QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), mTokenService(NULL), mExternalTokenQueue(tokenExternalQueue), mInternalTokenQueue(NULL), mGrpMeta(), mMode(mode), mEnabledFlags(enableFlags), mReadonlyFlags(0), mDefaultsFlags(defaultFlags) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), mTokenService(NULL), mExternalTokenQueue(tokenExternalQueue), mInternalTokenQueue(NULL), mGrpMeta(), mMode(mode), mEnabledFlags(enableFlags), mReadonlyFlags(0), mDefaultsFlags(defaultFlags)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
@ -82,21 +82,21 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *t
void GxsGroupDialog::init() void GxsGroupDialog::init()
{ {
// connect up the buttons. // connect up the buttons.
connect( ui.buttonBox, SIGNAL(accepted()), this, SLOT(submitGroup())); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(submitGroup()));
connect( ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancelDialog())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancelDialog()));
connect( ui.pubKeyShare_cb, SIGNAL( clicked() ), this, SLOT( setShareList( ) )); connect(ui.pubKeyShare_cb, SIGNAL(clicked()), this, SLOT(setShareList()));
connect( ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(createNewGxsId())); connect(ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(createNewGxsId()));
connect( ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo())); connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
connect( ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo())); connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
ui.typePublic->setChecked(true); ui.typePublic->setChecked(true);
updateCircleOptions(); updateCircleOptions();
connect( ui.typePublic, SIGNAL(clicked()), this , SLOT(updateCircleOptions())); connect(ui.typePublic, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
connect( ui.typeGroup, SIGNAL(clicked()), this , SLOT(updateCircleOptions())); connect(ui.typeGroup, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
connect( ui.typeLocal, SIGNAL(clicked()), this , SLOT(updateCircleOptions())); connect(ui.typeLocal, SIGNAL(clicked()), this , SLOT(updateCircleOptions()));
if (!ui.pubKeyShare_cb->isChecked()) if (!ui.pubKeyShare_cb->isChecked())
{ {
@ -111,16 +111,22 @@ void GxsGroupDialog::init()
/* Setup Reasonable Defaults */ /* Setup Reasonable Defaults */
ui.idChooser->loadIds(0,RsGxsId()); ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL,RsGxsCircleId()); ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
ui.localComboBox->loadCircles(GXS_CIRCLE_CHOOSER_PERSONAL,RsGxsCircleId()); ui.localComboBox->loadCircles(GXS_CIRCLE_CHOOSER_PERSONAL, RsGxsCircleId());
initMode(); initMode();
} }
QIcon GxsGroupDialog::serviceWindowIcon()
{
return qApp->windowIcon();
}
void GxsGroupDialog::showEvent(QShowEvent*) void GxsGroupDialog::showEvent(QShowEvent*)
{ {
ui.headerFrame->setHeaderImage(serviceImage()); ui.headerFrame->setHeaderImage(serviceImage());
setWindowIcon(serviceWindowIcon());
initUi(); initUi();
} }
@ -374,7 +380,6 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
case GXS_CIRCLE_TYPE_EXTERNAL: case GXS_CIRCLE_TYPE_EXTERNAL:
ui.typeGroup->setChecked(true); ui.typeGroup->setChecked(true);
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId); ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId);
break; break;
default: default:
std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType"; std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType";
@ -411,7 +416,6 @@ void GxsGroupDialog::submitGroup()
case MODE_EDIT: case MODE_EDIT:
{ {
editGroup(); editGroup();
} }
break; break;
@ -457,12 +461,12 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta)
std::cerr << std::endl; std::cerr << std::endl;
switch (ui.idChooser->getChosenId(meta.mAuthorId)) { switch (ui.idChooser->getChosenId(meta.mAuthorId)) {
case GxsIdChooser::KnowId: case GxsIdChooser::KnowId:
case GxsIdChooser::UnKnowId: case GxsIdChooser::UnKnowId:
break; break;
case GxsIdChooser::NoId: case GxsIdChooser::NoId:
case GxsIdChooser::None: case GxsIdChooser::None:
default: default:
return false; return false;
}//switch (ui.idChooser->getChosenId(meta.mAuthorId)) }//switch (ui.idChooser->getChosenId(meta.mAuthorId))
@ -494,7 +498,6 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta)
std::cerr << " External: " << meta.mCircleId; std::cerr << " External: " << meta.mCircleId;
std::cerr << std::endl; std::cerr << std::endl;
return true; return true;
} }
@ -545,7 +548,7 @@ uint32_t GxsGroupDialog::getGroupSignFlags()
signFlags |= RSGXS_GROUP_SIGN_PUBLISH_NONEREQ; signFlags |= RSGXS_GROUP_SIGN_PUBLISH_NONEREQ;
} }
// Author Signature. // Author Signature.
if (ui.personal_pgp->isChecked()) { if (ui.personal_pgp->isChecked()) {
signFlags |= RSGXS_GROUP_SIGN_AUTHOR_GPG; signFlags |= RSGXS_GROUP_SIGN_AUTHOR_GPG;
} else if (ui.personal_required->isChecked()) { } else if (ui.personal_required->isChecked()) {
@ -577,13 +580,13 @@ void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
} else if (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN) { } else if (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN) {
ui.personal_ifnopub->setChecked(true); ui.personal_ifnopub->setChecked(true);
} else if (signFlags & RSGXS_GROUP_SIGN_AUTHOR_NONE) { } else if (signFlags & RSGXS_GROUP_SIGN_AUTHOR_NONE) {
// Its the same... but not quite. // Its the same... but not quite.
//ui.personal_noifpub->setChecked(); //ui.personal_noifpub->setChecked();
} }
/* guess at comments */ /* guess at comments */
if ((signFlags & RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD) if ((signFlags & RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD) &&
&& (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN)) (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN))
{ {
ui.comments_allowed->setChecked(true); ui.comments_allowed->setChecked(true);
} }

3
retroshare-gui/src/gui/gxs/GxsGroupDialog.h
View file

@ -165,6 +165,7 @@ protected:
virtual void initUi() = 0; virtual void initUi() = 0;
virtual QPixmap serviceImage() = 0; virtual QPixmap serviceImage() = 0;
virtual QIcon serviceWindowIcon();
void setUiText(UiType uiType, const QString &text); void setUiText(UiType uiType, const QString &text);
@ -201,7 +202,6 @@ protected:
QString getDescription(); QString getDescription();
private slots: private slots:
/* actions to take.... */ /* actions to take.... */
void cancelDialog(); void cancelDialog();
@ -246,7 +246,6 @@ private:
uint32_t mDefaultsFlags; uint32_t mDefaultsFlags;
protected: protected:
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::GxsGroupDialog ui; Ui::GxsGroupDialog ui;
}; };

6
retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
View file

@ -11,11 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Create New</string> <string notr="true">Create New</string>
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin"> <property name="margin">

8
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
View file

@ -58,12 +58,12 @@ const uint32_t ChannelEditEnabledFlags = ChannelCreateEnabledFlags;
const uint32_t ChannelEditDefaultsFlags = ChannelCreateDefaultsFlags; const uint32_t ChannelEditDefaultsFlags = ChannelCreateDefaultsFlags;
GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenQueue, QWidget *parent) GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, ChannelCreateEnabledFlags, ChannelCreateDefaultsFlags, parent) : GxsGroupDialog(tokenQueue, ChannelCreateEnabledFlags, ChannelCreateDefaultsFlags, parent)
{ {
} }
GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent) GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent)
:GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ChannelEditEnabledFlags, ChannelEditDefaultsFlags, parent) : GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ChannelEditEnabledFlags, ChannelEditDefaultsFlags, parent)
{ {
} }
@ -97,11 +97,11 @@ QPixmap GxsChannelGroupDialog::serviceImage()
break; break;
case MODE_SHOW: case MODE_SHOW:
return QPixmap(":/images/channels.png"); return QPixmap(":/images/channels.png");
break;
case MODE_EDIT: case MODE_EDIT:
return QPixmap(":/images/channels.png"); return QPixmap(":/images/channels.png");
break;
} }
return QPixmap();
} }
bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)

1
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.h
View file

@ -39,7 +39,6 @@ protected:
virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta); virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description); virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta); virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
}; };
#endif #endif

9
retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
View file

@ -58,12 +58,12 @@ const uint32_t ForumEditEnabledFlags = ForumCreateEnabledFlags;
const uint32_t ForumEditDefaultsFlags = ForumCreateDefaultsFlags; const uint32_t ForumEditDefaultsFlags = ForumCreateDefaultsFlags;
GxsForumGroupDialog::GxsForumGroupDialog(TokenQueue *tokenQueue, QWidget *parent) GxsForumGroupDialog::GxsForumGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, ForumCreateEnabledFlags, ForumCreateDefaultsFlags, parent) : GxsGroupDialog(tokenQueue, ForumCreateEnabledFlags, ForumCreateDefaultsFlags, parent)
{ {
} }
GxsForumGroupDialog::GxsForumGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent) GxsForumGroupDialog::GxsForumGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent)
:GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ForumEditEnabledFlags, ForumEditDefaultsFlags, parent) : GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ForumEditEnabledFlags, ForumEditDefaultsFlags, parent)
{ {
} }
@ -72,18 +72,17 @@ void GxsForumGroupDialog::initUi()
switch (mode()) switch (mode())
{ {
case MODE_CREATE: case MODE_CREATE:
setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum")); setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum"));
setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum")); setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum"));
break; break;
case MODE_SHOW: case MODE_SHOW:
setUiText(UITYPE_SERVICE_HEADER, tr("Forum")); setUiText(UITYPE_SERVICE_HEADER, tr("Forum"));
break; break;
case MODE_EDIT: case MODE_EDIT:
setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum")); setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum"));
setUiText(UITYPE_BUTTONBOX_OK, tr("Update Forum")); setUiText(UITYPE_BUTTONBOX_OK, tr("Update Forum"));
break; break;
} }
setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Forum Admins")); setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Forum Admins"));
setUiText(UITYPE_CONTACTS_DOCK, tr("Select Forum Admins")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Forum Admins"));

2
retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.h
View file

@ -39,8 +39,6 @@ protected:
virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta); virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description); virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta); virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
}; };
#endif #endif

4
retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Message History</string> <string>Message History</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>

1
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View file

@ -333,7 +333,6 @@ void MessageWidget::getcurrentrecommended()
if (rsFiles->FileRequest(fi.fname, fi.hash, fi.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds) == false) { if (rsFiles->FileRequest(fi.fname, fi.hash, fi.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds) == false) {
QMessageBox mb(QObject::tr("File Request canceled"), QObject::tr("The following has not been added to your download list, because you already have it:\n ") + QString::fromUtf8(fi.fname.c_str()), QMessageBox::Critical, QMessageBox::Ok, 0, 0); QMessageBox mb(QObject::tr("File Request canceled"), QObject::tr("The following has not been added to your download list, because you already have it:\n ") + QString::fromUtf8(fi.fname.c_str()), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
mb.exec(); mb.exec();
} }
} }

4
retroshare-gui/src/gui/msgs/MessageWidget.ui
View file

@ -10,10 +10,6 @@
<height>539</height> <height>539</height>
</rect> </rect>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>

4
retroshare-gui/src/gui/msgs/MessageWindow.ui
View file

@ -10,10 +10,6 @@
<height>539</height> <height>539</height>
</rect> </rect>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing"> <property name="verticalSpacing">

3
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -273,7 +273,6 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad,
dialog.setWindowTitle(tr("PGP key passphrase")); dialog.setWindowTitle(tr("PGP key passphrase"));
dialog.setLabelText((prev_is_bad ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n %2").arg(tr("Please enter your PGP password for key"), QString::fromUtf8(key_details.c_str()))); dialog.setLabelText((prev_is_bad ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n %2").arg(tr("Please enter your PGP password for key"), QString::fromUtf8(key_details.c_str())));
dialog.setTextEchoMode(QLineEdit::Password); dialog.setTextEchoMode(QLineEdit::Password);
dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
dialog.setModal(true); dialog.setModal(true);
int ret = dialog.exec(); int ret = dialog.exec();
@ -302,7 +301,7 @@ bool NotifyQt::askForPluginConfirmation(const std::string& plugin_file_name, con
text += "</UL>" ; text += "</UL>" ;
dialog.setText(text) ; dialog.setText(text) ;
dialog.setWindowIcon(QIcon(":/images/rstray3.png")); dialog.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::No) ; dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::No) ;
int ret = dialog.exec(); int ret = dialog.exec();

4
retroshare-gui/src/gui/settings/GlobalRouterStatistics.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Router Statistics</string> <string>Router Statistics</string>
</property> </property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">

8
retroshare-gui/src/gui/settings/NewTag.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>New Tag</string> <string>New Tag</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -93,8 +89,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

8
retroshare-gui/src/gui/style/StyleDialog.ui
View file

@ -16,10 +16,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Define Style</string> <string>Define Style</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -188,8 +184,6 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources/>
<include location="../images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

3
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View file

@ -77,9 +77,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
//Settings->loadWidgetInformation(this); //Settings->loadWidgetInformation(this);
// Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
/* Create the config pages and actions */ /* Create the config pages and actions */
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
QAction *action; QAction *action;

16
retroshare-gui/src/gui/unfinished/profile/ProfileView.ui
View file

@ -13,10 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Profile View</string> <string>Profile View</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
@ -49,7 +45,7 @@ border-image: url(:/images/avatar_background.png);
<string/> <string/>
</property> </property>
<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"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -186,7 +182,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">
<normaloff>:/images/user/kuser24.png</normaloff>:/images/user/kuser24.png</iconset> <normaloff>:/images/user/kuser24.png</normaloff>:/images/user/kuser24.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -283,7 +279,7 @@ p, li { white-space: pre-wrap; }
<string>Close Profile</string> <string>Close Profile</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset resource="../../images.qrc">
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset> <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property> </property>
</widget> </widget>
@ -291,11 +287,7 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<resources> <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> </resources>
<connections/> <connections/>
</ui> </ui>

6
retroshare-gui/src/main.cpp
View file

@ -92,7 +92,7 @@ static void displayWarningAboutDSAKeys()
msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that.")); msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that."));
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setWindowIcon(QIcon(":/images/rstray3.png")); msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
msgBox.exec(); msgBox.exec();
} }
@ -184,7 +184,7 @@ int main(int argc, char *argv[])
msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>")); msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel); msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setWindowIcon(QIcon(":/images/rstray3.png")); msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
int ret = msgBox.exec(); int ret = msgBox.exec();
@ -213,7 +213,7 @@ int main(int argc, char *argv[])
displayWarningAboutDSAKeys(); displayWarningAboutDSAKeys();
QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok); QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png")); mb.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
switch (initResult) switch (initResult)
{ {

2
retroshare-gui/src/rshare.cpp
View file

@ -109,7 +109,7 @@ Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
#ifndef __APPLE__ #ifndef __APPLE__
/* set default window icon */ /* set default window icon */
setWindowIcon(QIcon(":/images/rstray3.png")); setWindowIcon(QIcon(":/images/logo/logo_32.png"));
#endif #endif

1
retroshare-gui/src/util/EventReceiver.cpp
View file

@ -121,7 +121,6 @@ bool EventReceiver::sendRetroShareLink(const QString& link)
Q_UNUSED(link); Q_UNUSED(link);
QMessageBox mb(QMessageBox::Critical, "RetroShare", QObject::tr("Start with a RetroShare link is only supported for Windows."), QMessageBox::Ok); QMessageBox mb(QMessageBox::Critical, "RetroShare", QObject::tr("Start with a RetroShare link is only supported for Windows."), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();
result = false; result = false;