diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index 4a50bcb6d..149a2f03f 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -40,6 +40,8 @@ #include #include #include +#include +#include /* Images for context menu icons */ #define IMAGE_DOWNLOAD ":/images/start.png" @@ -48,6 +50,7 @@ #define IMAGE_MSG ":/images/message-mail.png" #define IMAGE_ATTACHMENT ":/images/attachment.png" #define IMAGE_FRIEND ":/images/peers_16x16.png" +#define IMAGE_PROGRESS ":/images/browse-looking.gif" /** Constructor */ @@ -55,7 +58,9 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent) : MainPage(parent) { /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); + ui.setupUi(this); + + connect(ui.checkButton, SIGNAL(clicked()), this, SLOT(forceCheck())); @@ -133,6 +138,9 @@ void SharedFilesDialog::checkUpdate() if (rsicontrol->InDirectoryCheck()) { ui.hashLabel->setPixmap(QPixmap(IMAGE_HASH_BUSY)); + /*QMovie *movie = new QMovie(IMAGE_PROGRESS); + ui.hashLabel->setMovie(movie); + movie->start();*/ } else { diff --git a/retroshare-gui/src/gui/SharedFilesDialog.h b/retroshare-gui/src/gui/SharedFilesDialog.h index ea91c862e..3d4189896 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.h +++ b/retroshare-gui/src/gui/SharedFilesDialog.h @@ -86,7 +86,7 @@ private: QTreeView *shareddirtreeview; - + QMovie *movie; /** Qt Designer generated object */ Ui::SharedFilesDialog ui; diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index ba5419675..707d184f3 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -507,6 +507,9 @@ + + 0 + @@ -576,9 +579,6 @@ p, li { white-space: pre-wrap; } - - :/qss/black/checkBox_selected.png - diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 066b64e69..d7f043f1b 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -3,6 +3,7 @@ help/authors.html help/licence.html help/thanks.html + images/browse-looking.gif images/addfriendlabel.png images/backgroundl.png images/blockdevice.png @@ -192,6 +193,13 @@ images/textedit/textcenter.png images/textedit/textleft.png images/textedit/textright.png + images/textedit/text_bold.png + images/textedit/text_italic.png + images/textedit/text_under.png + images/textedit/text_block.png + images/textedit/text_center.png + images/textedit/text_left.png + images/textedit/text_right.png images/textedit/editcopy.png images/textedit/editcut.png images/textedit/editpaste.png diff --git a/retroshare-gui/src/gui/images/browse-looking.gif b/retroshare-gui/src/gui/images/browse-looking.gif new file mode 100644 index 000000000..6da15f60d Binary files /dev/null and b/retroshare-gui/src/gui/images/browse-looking.gif differ