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

- Deleted AddFriendDialog, InviteDialog and AddFriendWizard files. They are not used in current version, so it was beter not to keep them. We can always restore them, if any need.

Browse source 
- Removed "Invite friend" button from main window. 

- Also  changed some comments  to the wizard code.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
beardog_uk 2009-03-28 10:41:49 +00:00
parent afcc1d76d2
commit b3f433b5f2
8 changed files with 78 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,8 +61,8 @@
#include "rsiface/rspeers.h"
#include "rsiface/rsfiles.h"
#include "gui/connect/InviteDialog.h"
#include "gui/connect/AddFriendDialog.h"
//#include "gui/connect/InviteDialog.h"
//#include "gui/connect/AddFriendDialog.h"
#include "gui/connect/ConnectFriendWizard.h"
#include <sstream>
@ -98,7 +98,7 @@
#define IMAGE_PHOTO ":/images/lphoto.png"
#define IMAGE_SMPLAYER ":/images/smplayer_icon32.png"
#define IMAGE_ADDFRIEND ":/images/add-friend24.png"
#define IMAGE_INVITEFRIEND ":/images/invite-friend24.png"
//#define IMAGE_INVITEFRIEND ":/images/invite-friend24.png"
#define IMAGE_ADDSHARE ":/images/directoryadd_24x24_shadow.png"
#define IMAGE_OPTIONS ":/images/settings.png"
#define IMAGE_QUIT ":/images/exit_24x24.png"
@ -150,7 +150,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/** Left Side ToolBar**/
connect(ui.actionAdd_Friend, SIGNAL(triggered() ), this , SLOT( addFriend() ) );
connect(ui.actionInvite_Friend, SIGNAL(triggered() ), this , SLOT( inviteFriend() ) );
// connect(ui.actionInvite_Friend, SIGNAL(triggered() ), this , SLOT( inviteFriend() ) );
connect(ui.actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) );
connect(ui.actionOptions, SIGNAL(triggered()), this, SLOT( showPreferencesWindow()) );
connect(ui.actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) );
@ -494,41 +494,18 @@ void MainWindow::showWindow(Page page)
/** Add a Friend ShortCut */
void MainWindow::addFriend()
{
/* call load Certificate */
#if 0
std::string id;
if (connectionsDialog)
{
id = connectionsDialog->loadneighbour();
}
ConnectFriendWizard* connwiz = new ConnectFriendWizard(this);
/* call make Friend */
if (id != "")
{
connectionsDialog->showpeerdetails(id);
}
virtual int NeighLoadPEMString(std::string pem, std::string &id) = 0;
#else
/*
static AddFriendDialog *addDialog =
new AddFriendDialog(networkDialog, this);
// set widget to be deleted after close
connwiz->setAttribute( Qt::WA_DeleteOnClose, true);
std::string invite = "";
addDialog->setInfo(invite);
addDialog->show();
*/
static ConnectFriendWizard* connwiz = new ConnectFriendWizard(this);
connwiz->restart();
connwiz->show();
//delete connwiz;
#endif
}
/** Add a Friend ShortCut */
void MainWindow::inviteFriend()
/*void MainWindow::inviteFriend()
{
static InviteDialog *inviteDialog = new InviteDialog(this);
@ -538,7 +515,7 @@ void MainWindow::inviteFriend()
}
*/
/** Add a Share */
void MainWindow::addSharedDirectory()
{