Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed debug info, added missing error message

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-02-23 13:24:16 +00:00
parent c117078566
commit 718314af75
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View File

@ -365,8 +365,6 @@ ChatTabWidget *ChatLobbyWidget::getTabWidget()
void ChatLobbyWidget::displayChatLobbyEvent(qulonglong lobby_id, int event_type, const QString& nickname, const QString& str) void ChatLobbyWidget::displayChatLobbyEvent(qulonglong lobby_id, int event_type, const QString& nickname, const QString& str)
{ {
std::cerr << "Received displayChatLobbyEvent()!" << std::endl;
std::string vpid; std::string vpid;
if (rsMsgs->getVirtualPeerId(lobby_id, vpid)) { if (rsMsgs->getVirtualPeerId(lobby_id, vpid)) {
if (ChatLobbyDialog *cld = dynamic_cast<ChatLobbyDialog*>(ChatDialog::getExistingChat(vpid))) { if (ChatLobbyDialog *cld = dynamic_cast<ChatLobbyDialog*>(ChatDialog::getExistingChat(vpid))) {

49
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -43,7 +43,7 @@
#include "SearchDialog.h" #include "SearchDialog.h"
#include "TransfersDialog.h" #include "TransfersDialog.h"
#include "MessagesDialog.h" #include "MessagesDialog.h"
//#include "SharedFilesDialog.h" #include "SharedFilesDialog.h"
#include "PluginsPage.h" #include "PluginsPage.h"
#include "NewsFeed.h" #include "NewsFeed.h"
#include "ShareManager.h" #include "ShareManager.h"
@ -885,32 +885,35 @@ void SetForegroundWindowInternal(HWND hWnd)
return NULL; return NULL;
} }
switch (page) { switch (page)
// case Network: {
// return _instance->networkDialog; case Network:
case Friends: return _instance->friendsDialog->networkDialog;
return _instance->friendsDialog; case Friends:
case ChatLobby: return _instance->friendsDialog;
return _instance->chatLobbyDialog; case ChatLobby:
case Transfers: return _instance->chatLobbyDialog;
return _instance->transfersDialog; case Transfers:
// case SharedDirectories: return _instance->transfersDialog;
// return _instance->sharedfilesDialog; case SharedDirectories:
case Messages: return _instance->transfersDialog->localSharedFiles;
return _instance->messagesDialog; case Search:
return _instance->transfersDialog->searchDialog;
case Messages:
return _instance->messagesDialog;
#ifdef RS_USE_LINKS #ifdef RS_USE_LINKS
case Links: case Links:
return _instance->linksDialog; return _instance->linksDialog;
#endif #endif
case Channels: case Channels:
return _instance->channelFeed; return _instance->channelFeed;
case Forums: case Forums:
return _instance->forumsDialog; return _instance->forumsDialog;
#ifdef BLOGS #ifdef BLOGS
case Blogs: case Blogs:
return _instance->blogsFeed; return _instance->blogsFeed;
#endif #endif
} }
return NULL; return NULL;
} }

4
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -1215,7 +1215,9 @@ static void processList(const QStringList &list, const QString &textSingular, co
MainWindow::showWindow(MainWindow::Search); MainWindow::showWindow(MainWindow::Search);
SearchDialog *searchDialog = dynamic_cast<SearchDialog*>(MainWindow::getPage(MainWindow::Search)); SearchDialog *searchDialog = dynamic_cast<SearchDialog*>(MainWindow::getPage(MainWindow::Search));
if (!searchDialog) { if (!searchDialog)
{
std::cerr << "Retrieve of search dialog failed. Please debug!" << std::endl;
break; break;
} }

6
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -1490,7 +1490,7 @@ void TransfersDialog::changeSpeed(int speed)
void TransfersDialog::changeQueuePosition(QueueMove mv) void TransfersDialog::changeQueuePosition(QueueMove mv)
{ {
std::cerr << "In changeQueuePosition (gui)"<< std::endl ; // std::cerr << "In changeQueuePosition (gui)"<< std::endl ;
std::set<std::string> items; std::set<std::string> items;
std::set<std::string>::iterator it; std::set<std::string>::iterator it;
getSelectedItems(&items, NULL); getSelectedItems(&items, NULL);
@ -1503,7 +1503,7 @@ void TransfersDialog::changeQueuePosition(QueueMove mv)
void TransfersDialog::clearcompleted() void TransfersDialog::clearcompleted()
{ {
std::cerr << "TransfersDialog::clearcompleted()" << std::endl; // std::cerr << "TransfersDialog::clearcompleted()" << std::endl;
rsFiles->FileClearCompleted(); rsFiles->FileClearCompleted();
} }
@ -1512,8 +1512,6 @@ void TransfersDialog::showFileDetails()
std::string file_hash ; std::string file_hash ;
int nb_select = 0 ; int nb_select = 0 ;
std::cout << "new selection " << std::endl ;
for(int i = 0; i <= DLListModel->rowCount(); i++) for(int i = 0; i <= DLListModel->rowCount(); i++)
if(selection->isRowSelected(i, QModelIndex())) if(selection->isRowSelected(i, QModelIndex()))
{ {