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

resurected error msg window. Added a check for file hashes in FileRequest() to detect issues with badly formed file links

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-07 18:10:12 +00:00
parent 13bfd5617d
commit 3621ef4a95
7 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,6 +503,11 @@ void MainWindow::doQuit()
rApp->quit();
}
void MainWindow::displayErrorMessage(int a,int b,const QString& error_msg)
{
QMessageBox::critical(NULL, tr("Internal Error"),error_msg) ;
}
void MainWindow::closeEvent(QCloseEvent *e)
{
static bool firstTime = true;

1
retroshare-gui/src/gui/MainWindow.h
View file

@ -102,6 +102,7 @@ public slots:
void showWindow(Page page);
void updateHashingInfo(const QString&) ;
void displayErrorMessage(int,int,const QString&) ;
protected:
void closeEvent(QCloseEvent *);

6
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -31,11 +31,7 @@
void NotifyQt::notifyErrorMsg(int list, int type, std::string msg)
{
(void) list;
(void) type;
(void) msg;
return;
emit errorOccurred(list,type,QString::fromStdString(msg)) ;
}
void NotifyQt::notifyOwnAvatarChanged()

2
retroshare-gui/src/gui/notifyqt.h
View file

@ -40,6 +40,7 @@ class NotifyQt: public QObject, public NotifyBase
virtual void notifyPeerHasNewAvatar(std::string peer_id) ;
virtual void notifyOwnAvatarChanged() ;
virtual void notifyOwnStatusMessageChanged() ;
virtual std::string askForPassword(const std::string& window_title,const std::string& text) ;
signals:
@ -61,6 +62,7 @@ class NotifyQt: public QObject, public NotifyBase
void peerHasNewAvatar(const QString& peer_id) const ;
void ownAvatarChanged() const ;
void ownStatusMessageChanged() const ;
void errorOccurred(int,int,const QString&) const ;
public slots: