-added Log feature for QT .

-fixed Prefences and General Dialog
-disabled show function from main.cpp it will not allow to start minimized, it blocks minimize gui function.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-15 17:49:57 +00:00
parent 8b9e64f9f6
commit cb891ff08a
29 changed files with 961 additions and 1063 deletions

View file

@ -28,7 +28,6 @@
#include "NetworkDialog.h"
#include "NetworkView.h"
#include "connect/ConnectDialog.h"
#include "authdlg/AuthorizationDialog.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <sstream>
@ -138,16 +137,12 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
peerdetailsAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Make Friend / Peer Details" ), this );
connect( peerdetailsAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
//authAct = new QAction(QIcon(IMAGE_AUTH), tr( "Authenticate" ), this );
//connect( authAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
loadcertAct = new QAction(QIcon(IMAGE_LOADCERT), tr( "Load Certificate" ), this );
connect( loadcertAct , SIGNAL( triggered() ), this, SLOT( loadneighbour() ) );
contextMnu.clear();
contextMnu.addAction( peerdetailsAct);
//contextMnu.addAction( authAct);
contextMnu.addAction( loadcertAct);
contextMnu.exec( mevent->globalPos() );
}
@ -182,23 +177,6 @@ void NetworkDialog::showpeerdetails(std::string id)
}
}
/** Shows Connect Dialog */
void NetworkDialog::showAuthDialog()
{
static AuthorizationDialog *authorizationdialog = new AuthorizationDialog();
QTreeWidgetItem *wi = getCurrentNeighbour();
if (!wi)
return;
RsCertId id = getNeighRsCertId(wi);
std::ostringstream out;
out << id;
authorizationdialog->setAuthCode(out.str(), wi->text(9).toStdString());
authorizationdialog->show();
}
/** Open a QFileDialog to browse for a pem/pqi file. */
void NetworkDialog::loadcert()