Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 17:37:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

restored back some of my changes,

Browse Source 
added serviceheader text for Wiki and Forum

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-11-18 00:18:46 +00:00
parent 3fe147d5eb
commit 8da8f24683
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ const uint32_t ForumCreateDefaultsFlags = ( GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC
GxsForumGroupDialog::GxsForumGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, ForumCreateEnabledFlags, ForumCreateDefaultsFlags, parent)
:GxsGroupDialog(tokenQueue, ForumCreateEnabledFlags, ForumCreateDefaultsFlags, parent, "Create New Forum")
{

3
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View File

@ -66,9 +66,10 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenQueue, uint32_t enableFlags, uin
if(!serviceHeader.isEmpty())
ui.mServiceHeader->setText(serviceHeader);
setWindowTitle(serviceHeader);
//ui.headerFrame->setHeaderImage(QPixmap(":/WikiPoos/images/resource-group-new_48.png"));
//ui.headerFrame->setHeaderText(tr("Create Wiki Group"));
//ui.headerFrame->setHeaderText(tr("Create"));
if (!ui.pubKeyShare_cb->isChecked())
{

22
retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Create New Group</string>
<string>Create New</string>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
@ -69,7 +69,7 @@
<item row="0" column="1">
<widget class="QLabel" name="mServiceHeader">
<property name="text">
<string>Create Wiki Group</string>
<string>Create New</string>
</property>
</widget>
</item>
@ -99,7 +99,10 @@
</property>
<item>
<layout class="QGridLayout" name="gridLayout_4">
<property name="spacing">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0" rowspan="2">
@ -139,6 +142,12 @@ border-radius: 10px;
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
@ -190,7 +199,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Key recipients can publish to restricted-type Wiki Group, and can view and publish for private-type channels&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Add Wiki Moderators</string>
<string>Share Publish Key</string>
</property>
</widget>
</item>
@ -240,7 +249,7 @@ p, li { white-space: pre-wrap; }
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Select Wiki Moderators</string>
<string>Share Key With</string>
</property>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="_2">
@ -552,6 +561,9 @@ p, li { white-space: pre-wrap; }
<resources>
<include location="../images.qrc"/>
<include location="../WikiPoos/Wiki_images.qrc"/>
<include location="../WikiPoos/Wiki_images.qrc"/>
<include location="../WikiPoos/Wiki_images.qrc"/>
<include location="../WikiPoos/Wiki_images.qrc"/>
</resources>
<connections/>
</ui>

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

@ -52,7 +52,7 @@ uint32_t WikiCreateDefaultsFlags = ( GXS_GROUP_DEFAULTS_DISTRIB_PUBLIC |
WikiGroupDialog::WikiGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, WikiCreateEnabledFlags, WikiCreateDefaultsFlags, parent)
:GxsGroupDialog(tokenQueue, WikiCreateEnabledFlags, WikiCreateDefaultsFlags, parent, "Create New Wiki Group")
{
// To start with we only have open forums - with distribution controls.