mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 11:02:30 -04:00
ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
12536efd16
commit
08065b4298
22 changed files with 264 additions and 299 deletions
|
@ -105,8 +105,6 @@ public slots:
|
|||
void updateHashingInfo(const QString&) ;
|
||||
void displayErrorMessage(int,int,const QString&) ;
|
||||
|
||||
void updateToolBaricons();
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *);
|
||||
|
||||
|
@ -190,7 +188,7 @@ private:
|
|||
|
||||
QLabel *_hashing_info_label ;
|
||||
|
||||
QIcon MessageIcon;
|
||||
QAction *messageAction ;
|
||||
|
||||
/** Qt Designer generated object */
|
||||
Ui::MainWindow ui;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue