From 8da8f24683c33b91fa581a77901bb83d383548ef Mon Sep 17 00:00:00 2001 From: defnax <retroshare.project@gmail.com> Date: Sun, 18 Nov 2012 00:18:46 +0000 Subject: [PATCH] restored back some of my changes, 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 --- .../src/gui/gxs/GxsForumGroupDialog.cpp | 2 +- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 3 ++- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 22 ++++++++++++++----- .../src/gui/gxs/WikiGroupDialog.cpp | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsForumGroupDialog.cpp index 75232c960..66381d075 100644 --- a/retroshare-gui/src/gui/gxs/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsForumGroupDialog.cpp @@ -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") { diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index b3fc5d6bf..7e6108d68 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -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()) { diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index c16d9c4b8..197d001f3 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -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; } <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:8pt;">Key recipients can publish to restricted-type Wiki Group, and can view and publish for private-type channels</span></p></body></html></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> diff --git a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp index 3485ea605..6a4026714 100644 --- a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp @@ -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.