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

Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too.

Browse source 
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-17 20:36:36 +00:00
parent 7d7101a62d
commit 35c7605704
38 changed files with 3720 additions and 2552 deletions
Download patch file Download diff file Expand all files Collapse all files

88
retroshare-gui/src/gui/settings/RsharePeerSettings.cpp
View file

@ -29,6 +29,7 @@
#include <retroshare/rsinit.h>
#include <retroshare/rspeers.h>
#include <retroshare/rsmsgs.h>
#include "RsharePeerSettings.h"
#include "gui/style/RSStyle.h"
@ -36,7 +37,7 @@
/** The file in which all settings of he peers will read and written. */
#define SETTINGS_FILE (QString::fromUtf8(RsInit::RsProfileConfigDirectory().c_str()) + "/RSPeers.conf")
/* clean dead gpg id's after these days */
/* clean dead id's after these days */
#define DAYS_TO_CLEAN 7
/* Group for general data */
@ -56,10 +57,10 @@ RsharePeerSettings *PeerSettings = NULL;
RsharePeerSettings::RsharePeerSettings()
: QSettings(SETTINGS_FILE, QSettings::IniFormat)
{
cleanDeadGpgIds();
cleanDeadIds();
}
void RsharePeerSettings::cleanDeadGpgIds()
void RsharePeerSettings::cleanDeadIds()
{
beginGroup(GROUP_GENERAL);
QDateTime lastClean = value("lastClean").toDateTime();
@ -75,6 +76,10 @@ void RsharePeerSettings::cleanDeadGpgIds()
continue;
}
ChatLobbyId lid;
if (rsMsgs->isLobbyId((*group).toStdString(), lid)) {
continue;
}
if (rsPeers->isGPGAccepted((*group).toStdString()) == false) {
remove(*group);
}
@ -86,22 +91,27 @@ void RsharePeerSettings::cleanDeadGpgIds()
}
}
bool RsharePeerSettings::getGpgIdOfSslId(const std::string &sslId, std::string &gpgId)
bool RsharePeerSettings::getSettingsIdOfPeerId(const std::string &peerId, std::string &settingsId)
{
std::map<std::string, std::string>::iterator it = m_SslToGpg.find(sslId);
ChatLobbyId lid;
if (rsMsgs->isLobbyId(peerId, lid)) {
settingsId = peerId;
return true;
}
std::map<std::string, std::string>::iterator it = m_SslToGpg.find(peerId);
if (it != m_SslToGpg.end()) {
gpgId = it->second;
settingsId = it->second;
return true;
}
RsPeerDetails details;
if (rsPeers->getPeerDetails(sslId, details) == false) {
if (rsPeers->getPeerDetails(peerId, details) == false) {
return false;
}
gpgId = details.gpg_id;
m_SslToGpg[sslId] = gpgId;
settingsId = details.gpg_id;
m_SslToGpg[peerId] = settingsId;
return true;
}
@ -111,13 +121,13 @@ QVariant RsharePeerSettings::get(const std::string &peerId, const QString &key,
{
QVariant result;
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return result;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
result = value(key, defaultValue);
endGroup();
@ -127,13 +137,13 @@ QVariant RsharePeerSettings::get(const std::string &peerId, const QString &key,
/* set value of peer */
void RsharePeerSettings::set(const std::string &peerId, const QString &key, const QVariant &value)
{
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
setValue(key, value);
endGroup();
}
@ -170,13 +180,13 @@ void RsharePeerSettings::setPrivateChatOnTop(const std::string &peerId, bool val
void RsharePeerSettings::saveWidgetInformation(const std::string &peerId, QWidget *widget)
{
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
beginGroup("widgetInformation");
beginGroup(widget->objectName());
@ -190,13 +200,13 @@ void RsharePeerSettings::saveWidgetInformation(const std::string &peerId, QWidge
void RsharePeerSettings::loadWidgetInformation(const std::string &peerId, QWidget *widget)
{
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
beginGroup("widgetInformation");
beginGroup(widget->objectName());
@ -218,15 +228,25 @@ void RsharePeerSettings::setShowAvatarFrame(const std::string &peerId, bool valu
return set(peerId, "ShowAvatarFrame", value);
}
bool RsharePeerSettings::getShowParticipantsFrame(const std::string &peerId)
{
return get(peerId, "ShowParticipantsFrame", true).toBool();
}
void RsharePeerSettings::setShowParticipantsFrame(const std::string &peerId, bool value)
{
return set(peerId, "ShowParticipantsFrame", value);
}
void RsharePeerSettings::getStyle(const std::string &peerId, const QString &name, RSStyle &style)
{
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
beginGroup("style");
beginGroup(name);
@ -239,13 +259,13 @@ void RsharePeerSettings::getStyle(const std::string &peerId, const QString &name
void RsharePeerSettings::setStyle(const std::string &peerId, const QString &name, RSStyle &style)
{
std::string gpgId;
if (getGpgIdOfSslId(peerId, gpgId) == false) {
/* gpg id not found */
std::string settingsId;
if (getSettingsIdOfPeerId(peerId, settingsId) == false) {
/* settings id not found */
return;
}
beginGroup(QString::fromStdString(gpgId));
beginGroup(QString::fromStdString(settingsId));
beginGroup("style");
beginGroup(name);