Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Header Images

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-11-22 16:55:45 +00:00
parent 7398a2176f
commit 4e63561473
9 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
View File

@ -58,7 +58,7 @@ QString PostedGroupDialog::serviceHeader()
QPixmap PostedGroupDialog::serviceImage() QPixmap PostedGroupDialog::serviceImage()
{ {
return QPixmap(); return QPixmap(":/images/posted_add_64.png");
} }
bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) bool PostedGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)

1
retroshare-gui/src/gui/Posted/Posted_images.qrc
View File

@ -4,5 +4,6 @@
<file>images/posted_32.png</file> <file>images/posted_32.png</file>
<file>images/posted_48.png</file> <file>images/posted_48.png</file>
<file>images/posted_64.png</file> <file>images/posted_64.png</file>
<file>images/posted_add_64.png</file>
</qresource> </qresource>
</RCC> </RCC>

9
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View File

@ -32,6 +32,8 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
{ {
ui.setupUi(this); ui.setupUi(this);
connect(ui.pushButton_Cancel, SIGNAL( clicked( void ) ), this, SLOT( cancelEdit( void ) ) ); connect(ui.pushButton_Cancel, SIGNAL( clicked( void ) ), this, SLOT( cancelEdit( void ) ) );
connect(ui.pushButton_Revert, SIGNAL( clicked( void ) ), this, SLOT( revertEdit( void ) ) ); connect(ui.pushButton_Revert, SIGNAL( clicked( void ) ), this, SLOT( revertEdit( void ) ) );
connect(ui.pushButton_Submit, SIGNAL( clicked( void ) ), this, SLOT( submitEdit( void ) ) ); connect(ui.pushButton_Submit, SIGNAL( clicked( void ) ), this, SLOT( submitEdit( void ) ) );
@ -72,6 +74,9 @@ void WikiEditDialog::setNewPage()
ui.lineEdit_Page->setText(""); ui.lineEdit_Page->setText("");
ui.lineEdit_PrevVersion->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"));
} }
@ -197,6 +202,10 @@ void WikiEditDialog::setupData(const std::string &groupId, const std::string &pa
RsGxsGrpMsgIdPair msgId = std::make_pair(groupId, pageId); RsGxsGrpMsgIdPair msgId = std::make_pair(groupId, pageId);
requestPage(msgId); requestPage(msgId);
} }
ui.headerFrame->setHeaderImage(QPixmap(":/images/story-editor_48.png"));
ui.headerFrame->setHeaderText(tr("Edit Wiki Page"));
} }

10
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
View File

@ -21,7 +21,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="headerFrame"> <widget class="HeaderFrame" name="headerFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -191,6 +191,14 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources> <resources>
<include location="Wiki_images.qrc"/> <include location="Wiki_images.qrc"/>
</resources> </resources>

3
retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc
View File

@ -6,8 +6,11 @@
<file>images/appointment-new.png</file> <file>images/appointment-new.png</file>
<file>images/book2_32.png</file> <file>images/book2_32.png</file>
<file>images/story-editor.png</file> <file>images/story-editor.png</file>
<file>images/story-editor_48.png</file>
<file>images/republish.png</file> <file>images/republish.png</file>
<file>images/resource-group-new_48.png</file> <file>images/resource-group-new_48.png</file>
<file>images/wikibook_32.png</file> <file>images/wikibook_32.png</file>
<file>images/resource-group_64.png</file>
<file>images/appointment-new_64.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
retroshare-gui/src/gui/WikiPoos/images/appointment-new_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
retroshare-gui/src/gui/WikiPoos/images/resource-group_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
retroshare-gui/src/gui/WikiPoos/images/story-editor_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

2
retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp
View File

@ -124,7 +124,7 @@ QString WikiGroupDialog::serviceHeader()
QPixmap WikiGroupDialog::serviceImage() QPixmap WikiGroupDialog::serviceImage()
{ {
return QPixmap(); return QPixmap(":/images/resource-group_64.png");
} }
bool WikiGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) bool WikiGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)