diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 83042353b..ff037317f 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -47,7 +47,7 @@ ChannelFeed::ChannelFeed(QWidget *parent) /* Invoke the Qt Designer generated object setup routine */ setupUi(this); - connect(chanButton, SIGNAL(clicked()), this, SLOT(createChannel())); + connect(actionCreate_Channel, SIGNAL(triggered()), this, SLOT(createChannel())); connect(postButton, SIGNAL(clicked()), this, SLOT(sendMsg())); connect(subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeChannel ( void ) ) ); connect(unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) ); @@ -171,6 +171,11 @@ ChannelFeed::ChannelFeed(QWidget *parent) item2->setForeground(QBrush(QColor(79, 79, 79))); item3->setForeground(QBrush(QColor(79, 79, 79))); item4->setForeground(QBrush(QColor(79, 79, 79))); + + QMenu *channelmenu = new QMenu(); + channelmenu->addAction(actionCreate_Channel); + channelmenu->addSeparator(); + channelpushButton->setMenu(channelmenu); QTimer *timer = new QTimer(this); @@ -718,3 +723,4 @@ void ChannelFeed::toggleSelection(const QModelIndex &index) if (index.child(0, 0).isValid()) selectionModel->select(index, QItemSelectionModel::Toggle); } + diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index 43197dcac..77a98cb9e 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -25,7 +25,7 @@ Form - + @@ -36,13 +36,13 @@ - 220 + 221 0 - 220 + 221 16777215 @@ -54,7 +54,7 @@ - 220 + 221 0 @@ -72,12 +72,145 @@ 0 + + + + 220 + 0 + + + + + 220 + 16777215 + + + + + 220 + 0 + + + + QFrame#chheaderframe{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + 0 + + + + + + 24 + 24 + + + + + + + :/images/channels32.png + + + true + + + + + + + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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:10pt; font-weight:600;">Channels</span></p></body></html> + + + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + Add + + + QPushButton::menu-indicator { + subcontrol-origin: padding; + subcontrol-position: bottom right; + } + + QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { + position: relative; + top: 2px; left: 2px; /* shift the arrow by 2 px */ + } + + QPushButton:hover { + border: 1px solid #CCCCCC; + } + + + + + + + :/images/edit_add24.png:/images/edit_add24.png + + + + 16 + 16 + + + + false + + + true + + + + + + + - + @@ -293,30 +426,16 @@ p, li { white-space: pre-wrap; } - - - - - 75 - true - - - - Create New Channel - - - - :/images/add_channel24.png:/images/add_channel24.png - - - - 16 - 16 - - - - + + + + :/images/add_channel24.png:/images/add_channel24.png + + + Create Channel + + diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index 9bf0e7433..9002b2a20 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -80,7 +80,7 @@ ForumsDialog::ForumsDialog(QWidget *parent) connect( ui.forumTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( forumListCustomPopupMenu( QPoint ) ) ); connect( ui.threadTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( threadListCustomPopupMenu( QPoint ) ) ); - connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum())); + connect(ui.actionCreate_Forum, SIGNAL(triggered()), this, SLOT(newforum())); connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(createmessage())); connect(ui.newthreadButton, SIGNAL(clicked()), this, SLOT(showthread())); @@ -118,6 +118,11 @@ ForumsDialog::ForumsDialog(QWidget *parent) ui.threadTitle->setFont(mForumNameFont); loadForumEmoticons(); + + QMenu *forummenu = new QMenu(); + forummenu->addAction(ui.actionCreate_Forum); + forummenu->addSeparator(); + ui.forumpushButton->setMenu(forummenu); /* Hide platform specific features */ diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index cf92f849c..830298fdc 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -6,7 +6,7 @@ 0 0 - 515 + 600 420 @@ -505,15 +505,214 @@ Qt::DefaultContextMenu - + + + 0 + + + 0 + Qt::Horizontal - - - + + + + 300 + 16777215 + + + + + 220 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + QFrame#chheaderframe{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + 0 + + + + + + 24 + 24 + + + + + + + :/images/konversation.png + + + true + + + + + + + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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:9pt; font-weight:600;">Forums</span></p></body></html> + + + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + Add + + + QPushButton::menu-indicator { + subcontrol-origin: padding; + subcontrol-position: bottom right; + } + + QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { + position: relative; + top: 2px; left: 2px; /* shift the arrow by 2 px */ + } + + QPushButton:hover { + border: 1px solid #CCCCCC; + } + + + + + + + :/images/edit_add24.png:/images/edit_add24.png + + + + 16 + 16 + + + + false + + + true + + + + + + + <!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:'Arial'; font-size:8pt; 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;">Start new Thread for Selected Forum</p></body></html> + + + + + + + :/images/mail_new.png:/images/mail_new.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:'Arial'; font-size:8pt; 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;">Reply Message</p></body></html> + + + + + + + :/images/mail_reply.png:/images/mail_reply.png + + + + + + + true @@ -536,6 +735,12 @@ 0 + + + 300 + 0 + + 9 @@ -544,6 +749,9 @@ Qt::CustomContextMenu + + true + RetroShare Forums @@ -558,13 +766,6 @@ - - - - New Forum - - - @@ -575,42 +776,6 @@ - - - - <!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:'Arial'; font-size:8pt; 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;">Start new Thread for Selected Forum</p></body></html> - - - - - - - :/images/mail_new.png:/images/mail_new.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:'Arial'; font-size:8pt; 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;">Reply Message</p></body></html> - - - - - - - :/images/mail_reply.png:/images/mail_reply.png - - - @@ -735,23 +900,6 @@ background: white;} - - - - - 24 - 24 - - - - - - - - :/images/edit_remove24.png:/images/edit_remove24.png - - - @@ -845,6 +993,23 @@ background: white;} + + + + + 24 + 24 + + + + + + + + :/images/edit_remove24.png:/images/edit_remove24.png + + + @@ -879,6 +1044,15 @@ background: white;} PrintPreview + + + + :/images/new_forum16.png:/images/new_forum16.png + + + Create Forum + +