From c869fd863d27fcc3f902b0a88ba980e9162917b6 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 11 Jan 2014 22:02:05 +0000 Subject: [PATCH] =?UTF-8?q?=C3=82dded=20to=20change=20the=20string=20for?= =?UTF-8?q?=20the=20OK=20Button,=20for=20each=20different=20GXS=20Group=20?= =?UTF-8?q?Dialog=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7010 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp | 1 + retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 4 +++- retroshare-gui/src/gui/gxs/GxsGroupDialog.h | 3 ++- retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp | 1 + retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp | 1 + retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp | 4 +++- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index 020475910..3b805037f 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -79,6 +79,7 @@ void PostedGroupDialog::initUi() setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Topic Admins")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Topic Admins")); + setUiText(UITYPE_BUTTONBOX_OK, tr("Create Topic")); } QPixmap PostedGroupDialog::serviceImage() diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 2ecc06db4..6c35a82d7 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -129,6 +129,9 @@ void GxsGroupDialog::setUiText(UiType uiType, const QString &text) case UITYPE_CONTACTS_DOCK: ui.contactsdockWidget->setWindowTitle(text); break; + case UITYPE_BUTTONBOX_OK: + ui.buttonBox->button(QDialogButtonBox::Ok)->setText(text); + break; } } @@ -139,7 +142,6 @@ void GxsGroupDialog::initMode() case MODE_CREATE: { ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create Group")); newGroup(); } break; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h index f8cf39cec..793793889 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h @@ -116,7 +116,8 @@ public: enum UiType { UITYPE_SERVICE_HEADER, UITYPE_KEY_SHARE_CHECKBOX, - UITYPE_CONTACTS_DOCK + UITYPE_CONTACTS_DOCK, + UITYPE_BUTTONBOX_OK }; public: diff --git a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp index c688ff662..f82b864e2 100644 --- a/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp @@ -136,6 +136,7 @@ void WikiGroupDialog::initUi() setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Wiki Moderators")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Wiki Moderators")); + setUiText(UITYPE_BUTTONBOX_OK, tr("Create Group")); } QPixmap WikiGroupDialog::serviceImage() diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp index 6c60ddf5b..4f15db6fe 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp @@ -79,6 +79,7 @@ void GxsChannelGroupDialog::initUi() setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Channel Admins")); setUiText(UITYPE_CONTACTS_DOCK, tr("Select Channel Admins")); + setUiText(UITYPE_BUTTONBOX_OK, tr("Create Channel")); } QPixmap GxsChannelGroupDialog::serviceImage() diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp index 36351363b..f04b1772a 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp @@ -26,7 +26,7 @@ // To start with we only have open forums - with distribution controls. -const uint32_t ForumCreateEnabledFlags = ( GXS_GROUP_FLAGS_ICON | +const uint32_t ForumCreateEnabledFlags = ( //GXS_GROUP_FLAGS_ICON | GXS_GROUP_FLAGS_DESCRIPTION | GXS_GROUP_FLAGS_DISTRIBUTION | // GXS_GROUP_FLAGS_PUBLISHSIGN | @@ -76,6 +76,8 @@ void GxsForumGroupDialog::initUi() setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum")); break; } + + setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum")); } QPixmap GxsForumGroupDialog::serviceImage()