From 6e349749d010a19b317d6e1a96012d5cdd86cdc2 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 19 Nov 2012 16:27:39 +0000 Subject: [PATCH] Added to hide logo label and logo button, when calling "Create Wiki Group" switch text for some labels, when "Create Wiki Group" is called. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5844 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp | 5 +++-- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 12 +++++++++++- retroshare-gui/src/gui/gxs/GxsGroupDialog.h | 3 ++- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 7 +++---- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp index db0253ec0..74624dee4 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp @@ -28,7 +28,7 @@ #include "gui/WikiPoos/WikiAddDialog.h" #include "gui/WikiPoos/WikiEditDialog.h" -#include "gui/gxs/WikiGroupDialog.h" +#include "gui/gxs/WikiGroupDialog.h" #include @@ -160,7 +160,8 @@ void WikiDialog::OpenOrShowAddGroupDialog() void WikiDialog::newGroup() { WikiGroupDialog cf(mWikiQueue, this); - //cf.newGroup(); + //cf.newGroup(); + cf.wikitype(); cf.exec (); } diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 7e6108d68..97e2978b0 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -438,4 +438,14 @@ void GxsGroupDialog::setShareList() this->resize(this->size().width() - ui.contactsdockWidget->size().width(), this->size().height()); } } - + +void GxsGroupDialog::wikitype() +{ + // hide logo Button/Label + ui.groupLogo->hide(); + ui.addLogoButton->hide(); + + ui.headerImage->setPixmap(QPixmap(":/images/resource-group-new_48.png")) ; + ui.pubKeyShare_cb->setText(tr("Add Wiki Moderators")); + ui.contactsdockWidget->setWindowTitle(tr("Select Wiki Moderators")); +} diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h index 7cb5ed87a..b4186c898 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h @@ -134,10 +134,11 @@ public: * @param parent */ GxsGroupDialog(const RsGroupMetaData& grpMeta, uint32_t mode = GXS_GROUP_DIALOG_SHOW_MODE, QWidget *parent = NULL); + void wikitype(); private: void newGroup(); - void setMode(uint32_t mode); + void setMode(uint32_t mode); // Functions that can be overloaded for specific stuff. diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 197d001f3..777f80b11 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -51,7 +51,7 @@ 6 - + 48 @@ -61,9 +61,6 @@ - - :/images/resource-group-new_48.png - @@ -564,6 +561,8 @@ p, li { white-space: pre-wrap; } + +