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:
chrisparker126 2010-10-10 15:22:50 +00:00
parent e187204437
commit a612872d9b
3 changed files with 11 additions and 1 deletions

View File

@ -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);

View File

@ -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>

View File

@ -325,6 +325,13 @@ p, li { white-space: pre-wrap; }
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Toggle Message Read Status&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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>