diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index d44ab1a5a..6004975c7 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -58,7 +58,7 @@ QString PostedGroupDialog::serviceHeader() QPixmap PostedGroupDialog::serviceImage() { - return QPixmap(); + return QPixmap(":/images/posted_add_64.png"); } bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) diff --git a/retroshare-gui/src/gui/Posted/Posted_images.qrc b/retroshare-gui/src/gui/Posted/Posted_images.qrc index b2686ad8b..34fce9491 100644 --- a/retroshare-gui/src/gui/Posted/Posted_images.qrc +++ b/retroshare-gui/src/gui/Posted/Posted_images.qrc @@ -3,6 +3,7 @@ images/posted_24.png images/posted_32.png images/posted_48.png - images/posted_64.png + images/posted_64.png + images/posted_add_64.png diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp index 52a0d75c0..3c66b73b9 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp @@ -30,7 +30,9 @@ WikiEditDialog::WikiEditDialog(QWidget *parent) : QWidget(parent) { - ui.setupUi(this); + ui.setupUi(this); + + connect(ui.pushButton_Cancel, SIGNAL( clicked( void ) ), this, SLOT( cancelEdit( void ) ) ); connect(ui.pushButton_Revert, SIGNAL( clicked( void ) ), this, SLOT( revertEdit( void ) ) ); @@ -71,7 +73,10 @@ void WikiEditDialog::setNewPage() mRepublishMode = false; ui.lineEdit_Page->setText(""); ui.lineEdit_PrevVersion->setText(""); - ui.textEdit->setPlainText(""); + ui.textEdit->setPlainText(""); + + ui.headerFrame->setHeaderImage(QPixmap(":/images/appointment-new_64.png")); + ui.headerFrame->setHeaderText(tr("Create New Wiki Page")); } @@ -196,7 +201,11 @@ void WikiEditDialog::setupData(const std::string &groupId, const std::string &pa { RsGxsGrpMsgIdPair msgId = std::make_pair(groupId, pageId); requestPage(msgId); - } + } + + + ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png")); + ui.headerFrame->setHeaderText(tr("Edit Wiki Page")); } diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui index c215c3901..f64b82c6a 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui @@ -21,7 +21,7 @@ 0 - + QFrame::StyledPanel @@ -191,6 +191,14 @@ + + + HeaderFrame + QFrame +
gui/common/HeaderFrame.h
+ 1 +
+
diff --git a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc index 76299597a..1ea8313ef 100644 --- a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc +++ b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc @@ -5,9 +5,12 @@ images/resource-group-new.png images/appointment-new.png images/book2_32.png - images/story-editor.png + images/story-editor.png + images/story-editor_48.png images/republish.png images/resource-group-new_48.png - images/wikibook_32.png + images/wikibook_32.png + images/resource-group_64.png + images/appointment-new_64.png diff --git a/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png b/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png new file mode 100644 index 000000000..7b99cd877 Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png b/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png new file mode 100644 index 000000000..84cfa89fa Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png differ diff --git a/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png b/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png new file mode 100644 index 000000000..18e300d2e Binary files /dev/null and b/retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png differ diff --git a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp index dd7c23288..d5f68e084 100644 --- a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp @@ -124,7 +124,7 @@ QString WikiGroupDialog::serviceHeader() QPixmap WikiGroupDialog::serviceImage() { - return QPixmap(); + return QPixmap(":/images/resource-group_64.png"); } bool WikiGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)