Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-01-01 00:30:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

finished splitting

Browse source
This commit is contained in:
csoler 2025-12-23 15:52:41 +01:00
parent 0ba2c046a8
commit f0c844d8ea
8 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -284,14 +284,14 @@ void FriendsDialog::getAvatar()
std::cerr << "Avatar image size = " << ba.size() << std::endl ;
#endif
rsChats->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()) ; // last char 0 included.
rsChats->setOwnNodeAvatarData((unsigned char *)(ba.data()), ba.size()) ; // last char 0 included.
}
}
/** Loads own personal status */
void FriendsDialog::loadmypersonalstatus()
{
QString statustring = QString::fromUtf8(rsChats->getCustomStateString().c_str());
QString statustring = QString::fromUtf8(rsChats->getOwnCustomStateString().c_str());
if (statustring.isEmpty())
ui.mypersonalstatusLabel->setText(tr("Set your status message here."));

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

@ -223,7 +223,7 @@ void MessengerWindow::openShareManager()
/** Loads own personal status message */
void MessengerWindow::loadmystatusmessage()
{
ui.messagelineEdit->setEditText( QString::fromUtf8(rsChats->getCustomStateString().c_str()));
ui.messagelineEdit->setEditText( QString::fromUtf8(rsChats->getOwnCustomStateString().c_str()));
}
/** Save own status message */

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

@ -70,6 +70,8 @@
* #define NEWS_DEBUG 1
****/
using namespace Rs::Msgs;
static NewsFeed* instance = nullptr;
/** Constructor */

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

@ -384,7 +384,7 @@ void PopupChatWindow::getAvatar()
if (misc::getOpenAvatarPicture(this, ba)) {
std::cerr << "Avatar image size = " << ba.size() << std::endl ;
rsChats->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()); // last char 0 included.
rsChats->setOwnNodeAvatarData((unsigned char *)(ba.data()), ba.size()); // last char 0 included.
}
}

2
retroshare-gui/src/gui/common/AvatarWidget.cpp
View file

@ -124,7 +124,7 @@ void AvatarWidget::mouseReleaseEvent(QMouseEvent */*event*/)
QByteArray newAvatar;
dialog.getAvatar(newAvatar);
rsChats->setOwnAvatarData((unsigned char *)(newAvatar.data()), newAvatar.size()) ; // last char 0 included.
rsChats->setOwnNodeAvatarData((unsigned char *)(newAvatar.data()), newAvatar.size()) ; // last char 0 included.
}
}

2
retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
View file

@ -43,6 +43,8 @@
* #define DEBUG_ITEM 1
****/
using namespace Rs::Msgs;
/** Constructor */
ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId, const std::string &message) :
FeedItem(parent,feedId,NULL), mPeerId(peerId)

3
retroshare-gui/src/gui/feeds/MsgItem.cpp
View file

@ -43,6 +43,8 @@
* #define DEBUG_ITEM 1
****/
using namespace Rs::Msgs;
/** Constructor */
MsgItem::MsgItem(FeedHolder *parent, uint32_t feedId, const std::string &msgId, bool isHome) :
FeedItem(parent,feedId,NULL), mMsgId(msgId), mIsHome(isHome)
@ -123,6 +125,7 @@ void MsgItem::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
case RsMailStatusEventCode::TAG_CHANGED:
case RsMailStatusEventCode::MESSAGE_RECEIVED_ACK:
case RsMailStatusEventCode::SIGNATURE_FAILED:
default:
break;
}
}

2
retroshare-gui/src/gui/profile/StatusMessage.cpp
View file

@ -32,7 +32,7 @@ StatusMessage::StatusMessage(QWidget *parent)
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(save()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
ui.txt_StatusMessage->setText(QString::fromUtf8(rsChats->getCustomStateString().c_str()));
ui.txt_StatusMessage->setText(QString::fromUtf8(rsChats->getOwnCustomStateString().c_str()));
}
/** Saves the changes on this page */