diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp index b8e78c29a..87be83e91 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp @@ -143,7 +143,7 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) : /* Initialize display button */ initDisplayMenu(ui->displayButton); - ui->treeWidget->setIconSize(QSize(S*1.8,S*1.8)); + ui->treeWidget->setIconSize(QSize(S*1.6,S*1.6)); } GroupTreeWidget::~GroupTreeWidget() @@ -405,7 +405,7 @@ QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIc int S = QFontMetricsF(font).height(); - item->setSizeHint(COLUMN_NAME, QSize(S*1.9, S*1.9)); + item->setSizeHint(COLUMN_NAME, QSize(S*1.1, S*1.1)); item->setForeground(COLUMN_NAME, QBrush(textColorCategory())); nameLabel->setTextColor(textColorCategory()); item->setData(COLUMN_DATA, ROLE_COLOR, GROUPTREEWIDGET_COLOR_CATEGORY); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index c56cb3928..062de1814 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -27,8 +27,6 @@ #include "util/DateTime.h" #include "GxsGroupDialog.h" #include "gui/common/PeerDefs.h" -#include "gui/RetroShareLink.h" - #include "retroshare/rsgxsflags.h" #include @@ -447,8 +445,6 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) setupReadonly(); clearForm(); setGroupSignFlags(mGrpMeta.mSignFlags) ; - - RetroShareLink link; /* setup name */ ui.groupName->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str())); @@ -461,10 +457,7 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) ui.lastpostline->setText(tr("Never")); else ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost)); - ui.authorLabel->setId(mGrpMeta.mAuthorId); - link = RetroShareLink::createMessage(mGrpMeta.mAuthorId, ""); - ui.authorLabel->setText(link.toHtml()); - + ui.authorLabel->setId(mGrpMeta.mAuthorId); ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString())); ui.descriptiontextEdit->setPlainText(description); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 13ba9f593..56519718e 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 658 + 1237 + 1189 @@ -44,7 +44,7 @@ QFrame::Raised - 0 + 1 @@ -656,9 +656,6 @@ GxsIdLabel - - true - diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui index 035ca04eb..40858954b 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui @@ -460,8 +460,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<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;">Description</span></p></body></html> +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -489,9 +489,6 @@ p, li { white-space: pre-wrap; } unknown - - true - diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp index b402b4cf5..27f71e8e6 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.cpp +++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp @@ -52,15 +52,4 @@ void ChannelPage::load() { whileBlocking(ui.loadThreadCheckBox)->setChecked(Settings->getChannelLoadThread()); ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Channel); - - Settings->beginGroup(QString("ChannelPostsWidget")); - whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool()); - Settings->endGroup(); -} - -void ChannelPage::updateEmotes() -{ - Settings->beginGroup(QString("ChannelPostsWidget")); - Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked()); - Settings->endGroup(); } diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h index 0b0073821..69e28455b 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.h +++ b/retroshare-gui/src/gui/settings/ChannelPage.h @@ -40,9 +40,6 @@ public: virtual QString pageName() const { return tr("Channels") ; } virtual QString helpText() const { return ""; } -private slots: - void updateEmotes(); - protected slots: void updateLoadThread() ; diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui index cd0533552..ab8ac4b84 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.ui +++ b/retroshare-gui/src/gui/settings/ChannelPage.ui @@ -7,7 +7,7 @@ 0 0 423 - 334 + 340 @@ -36,13 +36,6 @@ - - - - Load Emoticons - - -