From accdf7e98240755adf10b1eb91ef6b8d91974d19 Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Sun, 2 Feb 2014 23:17:07 +0000 Subject: [PATCH] fixed segfault in forum show dialog prob merge issue git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7085 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 1 + retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 4010c9da6..4c5045983 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -150,6 +150,7 @@ void GxsGroupDialog::initMode() case MODE_CREATE: { ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create Forum")); newGroup(); } break; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp index 26b6855c0..9ee7a877f 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp @@ -72,17 +72,16 @@ void GxsForumGroupDialog::initUi() switch (mode()) { case MODE_CREATE: - setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum")); + setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum")); break; case MODE_SHOW: setUiText(UITYPE_SERVICE_HEADER, tr("Forum")); + break; case MODE_EDIT: setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum")); break; - } - - setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum")); + } } QPixmap GxsForumGroupDialog::serviceImage()