mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 15:39:27 -05:00
fixed bug that caused user to lose own channel if they unsubscribed it
removed channel file copying added tool tip for key sharing and tool tip for read status git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3661 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e187204437
commit
a612872d9b
@ -313,7 +313,7 @@ void ChannelFeed::updateChannelList()
|
|||||||
/* sort it into Publish (Own), Subscribed, Popular and Other */
|
/* sort it into Publish (Own), Subscribed, Popular and Other */
|
||||||
uint32_t flags = it->channelFlags;
|
uint32_t flags = it->channelFlags;
|
||||||
|
|
||||||
if (flags & RS_DISTRIB_ADMIN) {
|
if ((flags & RS_DISTRIB_ADMIN) && (flags & RS_DISTRIB_SUBSCRIBED)) {
|
||||||
adminList.push_back(*it);
|
adminList.push_back(*it);
|
||||||
} else if (flags & RS_DISTRIB_SUBSCRIBED) {
|
} else if (flags & RS_DISTRIB_SUBSCRIBED) {
|
||||||
subList.push_back(*it);
|
subList.push_back(*it);
|
||||||
|
@ -303,6 +303,9 @@
|
|||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="pubKeyShare_cb">
|
<widget class="QCheckBox" name="pubKeyShare_cb">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Key recipients can publish to restricted-type channels, and can view and publish for private-type channels </string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Share Private Publish Key</string>
|
<string>Share Private Publish Key</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -325,6 +325,13 @@ p, li { white-space: pre-wrap; }
|
|||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><!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:'Sans'; 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;">Toggle Message Read Status</p></body></html></string>
|
||||||
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="../images.qrc">
|
<iconset resource="../images.qrc">
|
||||||
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
|
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
|
||||||
|
Loading…
Reference in New Issue
Block a user