mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-29 01:16:20 -05:00
restore
This commit is contained in:
parent
3d66d84112
commit
6aefce4974
@ -143,7 +143,7 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
|
|||||||
/* Initialize display button */
|
/* Initialize display button */
|
||||||
initDisplayMenu(ui->displayButton);
|
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()
|
GroupTreeWidget::~GroupTreeWidget()
|
||||||
@ -405,7 +405,7 @@ QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIc
|
|||||||
|
|
||||||
int S = QFontMetricsF(font).height();
|
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()));
|
item->setForeground(COLUMN_NAME, QBrush(textColorCategory()));
|
||||||
nameLabel->setTextColor(textColorCategory());
|
nameLabel->setTextColor(textColorCategory());
|
||||||
item->setData(COLUMN_DATA, ROLE_COLOR, GROUPTREEWIDGET_COLOR_CATEGORY);
|
item->setData(COLUMN_DATA, ROLE_COLOR, GROUPTREEWIDGET_COLOR_CATEGORY);
|
||||||
|
@ -27,8 +27,6 @@
|
|||||||
#include "util/DateTime.h"
|
#include "util/DateTime.h"
|
||||||
#include "GxsGroupDialog.h"
|
#include "GxsGroupDialog.h"
|
||||||
#include "gui/common/PeerDefs.h"
|
#include "gui/common/PeerDefs.h"
|
||||||
#include "gui/RetroShareLink.h"
|
|
||||||
|
|
||||||
#include "retroshare/rsgxsflags.h"
|
#include "retroshare/rsgxsflags.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
@ -448,8 +446,6 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
|
|||||||
clearForm();
|
clearForm();
|
||||||
setGroupSignFlags(mGrpMeta.mSignFlags) ;
|
setGroupSignFlags(mGrpMeta.mSignFlags) ;
|
||||||
|
|
||||||
RetroShareLink link;
|
|
||||||
|
|
||||||
/* setup name */
|
/* setup name */
|
||||||
ui.groupName->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
|
ui.groupName->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str()));
|
||||||
|
|
||||||
@ -461,10 +457,7 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
|
|||||||
ui.lastpostline->setText(tr("Never"));
|
ui.lastpostline->setText(tr("Never"));
|
||||||
else
|
else
|
||||||
ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost));
|
ui.lastpostline->setText(DateTime::formatLongDateTime(mGrpMeta.mLastPost));
|
||||||
ui.authorLabel->setId(mGrpMeta.mAuthorId);
|
ui.authorLabel->setId(mGrpMeta.mAuthorId);
|
||||||
link = RetroShareLink::createMessage(mGrpMeta.mAuthorId, "");
|
|
||||||
ui.authorLabel->setText(link.toHtml());
|
|
||||||
|
|
||||||
ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString()));
|
ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString()));
|
||||||
ui.descriptiontextEdit->setPlainText(description);
|
ui.descriptiontextEdit->setPlainText(description);
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>600</width>
|
<width>1237</width>
|
||||||
<height>658</height>
|
<height>1189</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -44,7 +44,7 @@
|
|||||||
<enum>QFrame::Raised</enum>
|
<enum>QFrame::Raised</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="createmode">
|
<widget class="QWidget" name="createmode">
|
||||||
<layout class="QGridLayout" name="gridLayout_8">
|
<layout class="QGridLayout" name="gridLayout_8">
|
||||||
@ -656,9 +656,6 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GxsIdLabel</string>
|
<string>GxsIdLabel</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0">
|
<item row="5" column="0">
|
||||||
|
@ -460,8 +460,8 @@
|
|||||||
<string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
<string notr="true"><!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">
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||||
p, li { white-space: pre-wrap; }
|
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;">
|
</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-size:8pt;">Description</span></p></body></html></string>
|
<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></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="textInteractionFlags">
|
<property name="textInteractionFlags">
|
||||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
||||||
@ -489,9 +489,6 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>unknown</string>
|
<string>unknown</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
|
@ -52,15 +52,4 @@ void ChannelPage::load()
|
|||||||
{
|
{
|
||||||
whileBlocking(ui.loadThreadCheckBox)->setChecked(Settings->getChannelLoadThread());
|
whileBlocking(ui.loadThreadCheckBox)->setChecked(Settings->getChannelLoadThread());
|
||||||
ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Channel);
|
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();
|
|
||||||
}
|
}
|
||||||
|
@ -40,9 +40,6 @@ public:
|
|||||||
virtual QString pageName() const { return tr("Channels") ; }
|
virtual QString pageName() const { return tr("Channels") ; }
|
||||||
virtual QString helpText() const { return ""; }
|
virtual QString helpText() const { return ""; }
|
||||||
|
|
||||||
private slots:
|
|
||||||
void updateEmotes();
|
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void updateLoadThread() ;
|
void updateLoadThread() ;
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>423</width>
|
<width>423</width>
|
||||||
<height>334</height>
|
<height>340</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
@ -36,13 +36,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="emoteicon_checkBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Load Emoticons</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
Loading…
Reference in New Issue
Block a user