diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index c8d77b20c..b5d38129f 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -52,6 +52,13 @@ /* Images for TreeWidget */ #define IMAGE_FOLDER ":/images/folder16.png" #define IMAGE_FORUM ":/images/konversation16.png" +#define IMAGE_SUBSCRIBE ":/images/accepted16.png" +#define IMAGE_UNSUBSCRIBE ":/images/cancel.png" +#define IMAGE_INFO ":/images/info16.png" +#define IMAGE_NEWFORUM ":/images/new_forum16.png" + + + /** Constructor */ ForumsDialog::ForumsDialog(QWidget *parent) @@ -163,21 +170,22 @@ void ForumsDialog::forumListCustomPopupMenu( QPoint point ) QMenu contextMnu( this ); QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier ); - QAction *subForumAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "Subscribe to Forum" ), this ); + QAction *subForumAct = new QAction(QIcon(IMAGE_SUBSCRIBE), tr( "Subscribe to Forum" ), this ); connect( subForumAct , SIGNAL( triggered() ), this, SLOT( subscribeToForum() ) ); - QAction *unsubForumAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr( "Unsubscribe to Forum" ), this ); + QAction *unsubForumAct = new QAction(QIcon(IMAGE_UNSUBSCRIBE), tr( "Unsubscribe to Forum" ), this ); connect( unsubForumAct , SIGNAL( triggered() ), this, SLOT( unsubscribeToForum() ) ); - QAction *newForumAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "New Forum" ), this ); + QAction *newForumAct = new QAction(QIcon(IMAGE_NEWFORUM), tr( "New Forum" ), this ); connect( newForumAct , SIGNAL( triggered() ), this, SLOT( newforum() ) ); - QAction *detailsForumAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Show Forum Details" ), this ); + QAction *detailsForumAct = new QAction(QIcon(IMAGE_INFO), tr( "Show Forum Details" ), this ); connect( detailsForumAct , SIGNAL( triggered() ), this, SLOT( showForumDetails() ) ); contextMnu.clear(); contextMnu.addAction( subForumAct ); contextMnu.addAction( unsubForumAct ); + contextMnu.addSeparator(); contextMnu.addAction( newForumAct ); contextMnu.addAction( detailsForumAct ); contextMnu.exec( mevent->globalPos() ); diff --git a/retroshare-gui/src/gui/SharedFilesDialog.ui b/retroshare-gui/src/gui/SharedFilesDialog.ui index 2c47f659e..adf23714d 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/SharedFilesDialog.ui @@ -565,6 +565,9 @@ p, li { white-space: pre-wrap; } + + 0 + @@ -582,15 +585,22 @@ p, li { white-space: pre-wrap; } + + + :/images/hide_toolbox_frame.png:/images/hide_toolbox_frame.png + - 16 + 14 31 true + + true + diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index 07854b40d..ff0ecab27 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -22,18 +22,23 @@ #include "CreateForumMsg.h" +#include + #include "rsiface/rsforums.h" /** Constructor */ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId) -: QWidget(NULL), mForumId(fId), mParentId(pId) +: QMainWindow(NULL), mForumId(fId), mParentId(pId) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + RshareSettings config; + config.loadWidgetInformation(this); + // connect up the buttons. - connect( ui.cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancelMsg( ) ) ); - connect( ui.postButton, SIGNAL( clicked ( bool ) ), this, SLOT( createMsg( ) ) ); + connect( ui.postmessage_action, SIGNAL( triggered (bool) ), this, SLOT( cancelMsg( ) ) ); + connect( ui.close_action, SIGNAL( triggered (bool) ), this, SLOT( createMsg( ) ) ); newMsg(); @@ -72,5 +77,8 @@ void CreateForumMsg::cancelMsg() { close(); return; + + RshareSettings config; + config.saveWidgetInformation(this); } diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.h b/retroshare-gui/src/gui/forums/CreateForumMsg.h index 877b1e9fd..9cf377725 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.h +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.h @@ -28,7 +28,7 @@ #include "ui_CreateForumMsg.h" -class CreateForumMsg : public QWidget +class CreateForumMsg : public QMainWindow { Q_OBJECT diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui index 368a55921..c4c61b524 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui @@ -1,641 +1,142 @@ CreateForumMsg - + 0 0 - 358 - 435 + 441 + 353 - - - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - Post Forum Msg + Post Forum Message - ../msgs + + :/images/rstray3.png:/images/rstray3.png - - - - - - - - - Forum - - - - - - - - - - - - - - Forum Post Subject - - - - - - - - - - - - - - Forum Post - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Sign Message - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel Msg - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Post Forum Msg - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - + + Qt::ToolButtonTextUnderIcon + + + + + 0 + 52 + 441 + 301 + + + + + + + + + + + Forum + + + + + + + + + + + + + + Forum Post Subject + + + + + + + + + + + + + + Forum Post + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Sign Message + + + + + + + + + + + + + + + + 0 + 0 + 441 + 52 + + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + :/images/mail_send24.png:/images/mail_send24.png + + + Post Forum Msg + + + + + + :/images/button_cancel.png:/images/button_cancel.png + + + Close + + - - postButton - diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 441fee619..5b4843fbf 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -179,6 +179,7 @@ images/mail_reply.png images/mail_send.png images/mail_new.png + images/mail_send24.png images/message-mail.png images/message-mail-read.pngm images/message-news.png @@ -191,6 +192,7 @@ images/new-account.png images/new-contact.png images/new-mail-alert.png + images/new_forum16.png images/nopic.png images/package_games1.png images/peerdetails_16x16.png diff --git a/retroshare-gui/src/gui/images/mail_send24.png b/retroshare-gui/src/gui/images/mail_send24.png new file mode 100644 index 000000000..be6d64f00 Binary files /dev/null and b/retroshare-gui/src/gui/images/mail_send24.png differ