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

* Cleaned up more debug output.

Browse source 
* Fixed Popup Chats with new Peer Dialog.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-07-10 18:52:56 +00:00
parent d36b15d526
commit 67a27744f8
8 changed files with 65 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -198,8 +198,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
// createPageAction(QIcon(IMAGE_STATISTIC), tr("Statistics"), grp));
/* also an empty list of chat windows */
peersDialog->setChatDialog(chatDialog);
messengerWindow->setChatDialog(chatDialog);
messengerWindow->setChatDialog(peersDialog);
/* Create the toolbar */
ui.toolBar->addActions(grp->actions());
@ -691,8 +690,15 @@ void MainWindow::showsmplayer()
void MainWindow::playFiles(QStringList files)
{
std::cerr << "MainWindow::playFiles()" << std::endl;
showsmplayer();
std::cerr << "MainWindow::playFiles() showsmplayer() done" << std::endl;
mSMPlayer->gui()->openFiles(files);
std::cerr << "MainWindow::playFiles() done" << std::endl;
}