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

Moved the chat lobby tabs to the FriendsDialog.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-18 20:02:19 +00:00
parent 1ec716175b
commit 912e5339ca
12 changed files with 73 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,10 @@
#include <QMessageBox>
#include "ChatLobbyDialog.h"
#include "gui/ChatLobbyWidget.h"
#include "ChatTabWidget.h"
#include "gui/settings/rsharesettings.h"
#include "gui/settings/RsharePeerSettings.h"
#include "gui/FriendsDialog.h"
#include <retroshare/rsnotify.h>
@ -55,7 +56,7 @@ void ChatLobbyDialog::init(const std::string &peerId, const QString &title)
showParticipantsFrame(PeerSettings->getShowParticipantsFrame(peerId));
// add to window
ChatTabWidget *tabWidget = ChatLobbyWidget::getTabWidget();
ChatTabWidget *tabWidget = FriendsDialog::getTabWidget();
if (tabWidget) {
tabWidget->addDialog(this);
}
@ -174,7 +175,7 @@ bool ChatLobbyDialog::canClose()
void ChatLobbyDialog::showDialog(uint chatflags)
{
if (chatflags & RS_CHAT_FOCUS) {
ChatTabWidget *tabWidget = ChatLobbyWidget::getTabWidget();
ChatTabWidget *tabWidget = FriendsDialog::getTabWidget();
if (tabWidget) {
tabWidget->setCurrentWidget(this);
}

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

@ -30,7 +30,7 @@
#define IMAGE_CHAT ":/images/chat.png"
ChatTabWidget::ChatTabWidget(QWidget *parent) :
QTabWidget(parent),
RSTabWidget(parent),
ui(new Ui::ChatTabWidget)
{
ui->setupUi(this);

4
retroshare-gui/src/gui/chat/ChatTabWidget.h
View file

@ -23,7 +23,7 @@
#ifndef CHATTABWIDGET_H
#define CHATTABWIDGET_H
#include <QTabWidget>
#include "gui/common/RSTabWidget.h"
namespace Ui {
class ChatTabWidget;
@ -31,7 +31,7 @@ class ChatTabWidget;
class ChatDialog;
class ChatTabWidget : public QTabWidget
class ChatTabWidget : public RSTabWidget
{
Q_OBJECT