diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index b2e1305dc..0ef1f3632 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -56,7 +56,7 @@ #define IMAGE_FOLDERRED ":/images/folder_red.png" #define IMAGE_FOLDERYELLOW ":/images/folder_yellow.png" #define IMAGE_FORUM ":/images/konversation16.png" -#define IMAGE_SUBSCRIBE ":/images/accepted16.png" +#define IMAGE_SUBSCRIBE ":/images/edit_add24.png" #define IMAGE_UNSUBSCRIBE ":/images/cancel.png" #define IMAGE_INFO ":/images/info16.png" #define IMAGE_NEWFORUM ":/images/new_forum16.png" @@ -756,7 +756,7 @@ void ForumsDialog::markMsgAsRead() void ForumsDialog::newforum() { - CreateForum *cf = new CreateForum(NULL, true); + static CreateForum *cf = new CreateForum(this); cf->show(); } diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui index 1aebf634e..b173f6f37 100644 --- a/retroshare-gui/src/gui/ShareManager.ui +++ b/retroshare-gui/src/gui/ShareManager.ui @@ -20,6 +20,9 @@ + + 0 + @@ -34,6 +37,9 @@ 48 + + background-image: url(:/images/connect/connectFriendBanner.png)v + @@ -44,12 +50,16 @@ + + background-image: url(:/images/connect/connectFriendBanner.png) + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; font-weight:600; color:#32cd32;">Share Manager</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt;"><span style=" font-size:10pt;">Add a new Folder to Share with your Friends or remove a Shared Folder.</span></p></body></html> +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:16pt; font-weight:600; color:#32cd32;"> Share Manager</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:10pt;"> Add a new Folder to Share with your Friends or remove a Shared Folder.</span></p></body></html> @@ -93,9 +103,6 @@ p, li { white-space: pre-wrap; } 22 - - 22 - Directory diff --git a/retroshare-gui/src/gui/forums/CreateForum.cpp b/retroshare-gui/src/gui/forums/CreateForum.cpp index 346b8552a..adb266f99 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.cpp +++ b/retroshare-gui/src/gui/forums/CreateForum.cpp @@ -28,7 +28,7 @@ /** Constructor */ CreateForum::CreateForum(QWidget *parent, bool isForum) -: QWidget(parent), mIsForum(isForum) +: QDialog(parent), mIsForum(isForum) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); diff --git a/retroshare-gui/src/gui/forums/CreateForum.h b/retroshare-gui/src/gui/forums/CreateForum.h index db110de3b..7ebe676ad 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.h +++ b/retroshare-gui/src/gui/forums/CreateForum.h @@ -27,7 +27,7 @@ #include "ui_CreateForum.h" -class CreateForum : public QWidget +class CreateForum : public QDialog { Q_OBJECT diff --git a/retroshare-gui/src/gui/forums/CreateForum.ui b/retroshare-gui/src/gui/forums/CreateForum.ui index b1d94af09..6aa82ea2b 100644 --- a/retroshare-gui/src/gui/forums/CreateForum.ui +++ b/retroshare-gui/src/gui/forums/CreateForum.ui @@ -1,170 +1,171 @@ - + + CreateForum - - + + 0 0 - 480 - 428 + 490 + 414 - - + + 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 @@ -173,153 +174,153 @@ - - - + + + 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 @@ -328,153 +329,153 @@ - - - + + + 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 @@ -484,7 +485,7 @@ - + Arial 8 @@ -495,68 +496,108 @@ false - + Qt::NoContextMenu - + Create a Forum - - + + :/images/rstray3.png:/images/rstray3.png - - - + + + + + 0 + + + + + + 64 + 64 + + + + background-image: url(:/images/connect/connectFriendBanner.png) + + + + + + :/images/konversation64.png + + + + + + + background-image: url(:/images/connect/connectFriendBanner.png) + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:24pt; font-weight:600; color:#00ff00;"> Create a new Forum</span></p></body></html> + + + + + + + - - + + Name - + - - + + - - + + Description - + - - - + + + Type: - + - - + + Public - Anyone can read and publish (Shared Publish Key) - - + + Restricted - Anyone can read, limited publishing (Private Publish Key) - - + + Private - (Private Publish Key required to view Messages) @@ -564,22 +605,22 @@ - - - + + + Allowed Messages - + - - + + Authemticated Messages - - + + Anonymous Messages @@ -587,14 +628,14 @@ - - + + - + Qt::Horizontal - + 40 20 @@ -603,57 +644,38 @@ - - + + Cancel - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + Create - + true - - - - Qt::Horizontal - - - - 40 - 20 - - - - + + + + Qt::Horizontal + + + createButton - + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index d3aa1d0ab..b22990e66 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -200,6 +200,7 @@ images/konversation.png images/konversation16.png images/konversation128.png + images/konversation64.png images/ksysguard.png images/ksysguard32.png images/ktorrent.png