mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Added a new button in ChanMsgItem and ForumMsgItem to set the message as read (without expanding the message) and remove the item from the news feed.
Redesigned ChanMsgItem. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
cd3ec84d15
commit
219c5db3c9
@ -54,6 +54,7 @@ ChanMsgItem::ChanMsgItem(FeedHolder *parent, uint32_t feedId, const std::string
|
||||
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
|
||||
|
||||
/* specific */
|
||||
connect(readAndClearButton, SIGNAL(clicked()), this, SLOT(readAndClearItem()));
|
||||
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) );
|
||||
connect( downloadButton, SIGNAL( clicked( void ) ), this, SLOT( download ( void ) ) );
|
||||
connect( playButton, SIGNAL( clicked( void ) ), this, SLOT( play ( void ) ) );
|
||||
@ -129,6 +130,7 @@ void ChanMsgItem::updateItemStatic()
|
||||
clearButton->setEnabled(false);
|
||||
unsubscribeButton->setEnabled(false);
|
||||
clearButton->hide();
|
||||
readAndClearButton->hide();
|
||||
unsubscribeButton->hide();
|
||||
copyLinkButton->show();
|
||||
|
||||
@ -331,6 +333,17 @@ void ChanMsgItem::removeItem()
|
||||
|
||||
/*********** SPECIFIC FUNCTIONS ***********************/
|
||||
|
||||
void ChanMsgItem::readAndClearItem()
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
std::cerr << "ChanMsgItem::readAndClearItem()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
readToggled(false);
|
||||
removeItem();
|
||||
}
|
||||
|
||||
void ChanMsgItem::unsubscribeChannel()
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
|
||||
@ -47,6 +47,7 @@ private slots:
|
||||
void removeItem();
|
||||
void toggle();
|
||||
|
||||
void readAndClearItem();
|
||||
void unsubscribeChannel();
|
||||
void download();
|
||||
void play();
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>546</width>
|
||||
<width>629</width>
|
||||
<height>208</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -91,325 +91,367 @@ border-radius: 10px;}</string>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="horizontalSpacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item row="0" column="0" rowspan="2" colspan="5">
|
||||
<widget class="QLabel" name="titleLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>11</pointsize>
|
||||
<weight>75</weight>
|
||||
<italic>true</italic>
|
||||
<bold>true</bold>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="titleLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>11</pointsize>
|
||||
<weight>75</weight>
|
||||
<italic>true</italic>
|
||||
<bold>true</bold>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<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">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:11pt; font-weight:600; font-style:italic;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:normal; color:#656565;">Channel Subject</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="7" rowspan="2" colspan="5">
|
||||
<widget class="QLabel" name="datetimelabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="datetimelabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<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">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:600; 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; color:#666666;">DateTime</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="2" column="8" colspan="4">
|
||||
<widget class="QLabel" name="filelabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">fileLabel</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="8">
|
||||
<widget class="QLabel" name="subjectLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="subjectLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>60</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<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">
|
||||
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; color:#666666;">Short Description</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="filelabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">fileLabel</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QPushButton" name="readButton">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Toggle Message Read Status</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLabel" name="warn_image_label">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../images.qrc">:/images/status_unknown.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="warning_label">
|
||||
<property name="text">
|
||||
<string notr="true">TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLabel" name="newLabel">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="spacing">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{border: 1px solid #167BE7;
|
||||
<item>
|
||||
<widget class="QPushButton" name="readButton">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Toggle Message Read Status</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="newLabel">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<stylestrategy>PreferAntialias</stylestrategy>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{border: 1px solid #167BE7;
|
||||
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
|
||||
stop: 0 #2291E0, stop: 1 #3EB3FF);
|
||||
border-radius: 3px}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>New</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QPushButton" name="downloadButton">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>-1</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Download</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QPushButton" name="playButton">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>-1</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Play</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="4">
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Expanding</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>13</width>
|
||||
<height>21</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="warn_image_label">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../images.qrc">:/images/status_unknown.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1" colspan="8">
|
||||
<widget class="QLabel" name="warning_label">
|
||||
<property name="text">
|
||||
<string notr="true">TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="7" colspan="2">
|
||||
<widget class="QPushButton" name="unsubscribeButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Unsubscribe From Channel</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="10">
|
||||
<widget class="QPushButton" name="clearButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Remove Item</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="11">
|
||||
<widget class="QPushButton" name="expandButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Expand</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="6">
|
||||
<widget class="QPushButton" name="copyLinkButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Copy RetroShare Link</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>New</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="downloadButton">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>-1</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Download</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="playButton">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>-1</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Play</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="copyLinkButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Copy RetroShare Link</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="unsubscribeButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Unsubscribe From Channel</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="expandButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Expand</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="readAndClearButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Set as read and remove item</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="clearButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Remove Item</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
||||
@ -55,6 +55,7 @@ ForumMsgItem::ForumMsgItem(FeedHolder *parent, uint32_t feedId, const std::strin
|
||||
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
|
||||
|
||||
/* specific ones */
|
||||
connect(readAndClearButton, SIGNAL(clicked()), this, SLOT(readAndClearItem()));
|
||||
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeForum ( void ) ) );
|
||||
connect( replyButton, SIGNAL( clicked( void ) ), this, SLOT( replyToPost ( void ) ) );
|
||||
connect( sendButton, SIGNAL( clicked( ) ), this, SLOT( sendMsg() ) );
|
||||
@ -264,28 +265,7 @@ void ForumMsgItem::toggle()
|
||||
nextFrame->show();
|
||||
}
|
||||
|
||||
uint32_t status;
|
||||
rsForums->getMessageStatus(mForumId, mPostId, status);
|
||||
|
||||
if (canReply) {
|
||||
/* set always to read ... */
|
||||
uint32_t statusNew = status | FORUM_MSG_STATUS_READ;
|
||||
|
||||
// bool setToReadOnActive = Settings->getForumMsgSetToReadOnActivate();
|
||||
// if (setToReadOnActive) {
|
||||
/* ... and to read by user */
|
||||
statusNew &= ~FORUM_MSG_STATUS_UNREAD_BY_USER;
|
||||
// } else {
|
||||
// /* ... and to unread by user */
|
||||
// statusNew |= FORUM_MSG_STATUS_UNREAD_BY_USER;
|
||||
// }
|
||||
|
||||
if (status != statusNew) {
|
||||
disconnect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)));
|
||||
rsForums->setMessageStatus(mForumId, mPostId, statusNew, FORUM_MSG_STATUS_READ | FORUM_MSG_STATUS_UNREAD_BY_USER);
|
||||
connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)), Qt::QueuedConnection);
|
||||
}
|
||||
}
|
||||
setAsRead();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -314,6 +294,17 @@ void ForumMsgItem::removeItem()
|
||||
|
||||
/*********** SPECIFIC FUNCTIOSN ***********************/
|
||||
|
||||
void ForumMsgItem::readAndClearItem()
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
std::cerr << "ForumMsgItem::readAndClearItem()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
setAsRead();
|
||||
removeItem();
|
||||
}
|
||||
|
||||
void ForumMsgItem::unsubscribeForum()
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
@ -417,3 +408,29 @@ void ForumMsgItem::forumMsgReadSatusChanged(const QString &forumId, const QStrin
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ForumMsgItem::setAsRead()
|
||||
{
|
||||
if (canReply) {
|
||||
uint32_t status;
|
||||
rsForums->getMessageStatus(mForumId, mPostId, status);
|
||||
|
||||
/* set always to read ... */
|
||||
uint32_t statusNew = status | FORUM_MSG_STATUS_READ;
|
||||
|
||||
// bool setToReadOnActive = Settings->getForumMsgSetToReadOnActivate();
|
||||
// if (setToReadOnActive) {
|
||||
/* ... and to read by user */
|
||||
statusNew &= ~FORUM_MSG_STATUS_UNREAD_BY_USER;
|
||||
// } else {
|
||||
// /* ... and to unread by user */
|
||||
// statusNew |= FORUM_MSG_STATUS_UNREAD_BY_USER;
|
||||
// }
|
||||
|
||||
if (status != statusNew) {
|
||||
disconnect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)));
|
||||
rsForums->setMessageStatus(mForumId, mPostId, statusNew, FORUM_MSG_STATUS_READ | FORUM_MSG_STATUS_UNREAD_BY_USER);
|
||||
connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)), Qt::QueuedConnection);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,6 +43,7 @@ private slots:
|
||||
void removeItem();
|
||||
void toggle();
|
||||
|
||||
void readAndClearItem();
|
||||
void unsubscribeForum();
|
||||
void subscribeForum();
|
||||
void replyToPost();
|
||||
@ -53,6 +54,8 @@ private slots:
|
||||
void updateItem();
|
||||
|
||||
private:
|
||||
void setAsRead();
|
||||
|
||||
FeedHolder *mParent;
|
||||
uint32_t mFeedId;
|
||||
bool canReply;
|
||||
|
||||
@ -257,6 +257,23 @@ border-radius: 10px}</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="readAndClearButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Set as read and remove item</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="clearButton">
|
||||
<property name="sizePolicy">
|
||||
@ -293,7 +310,7 @@ border-radius: 10px}</string>
|
||||
</property>
|
||||
<layout class="QGridLayout">
|
||||
<item row="0" column="0" rowspan="2">
|
||||
<widget class="AvatarWidget" name="avatar" native="true">
|
||||
<widget class="AvatarWidget" name="avatar">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
@ -457,7 +474,7 @@ border-radius: 10px}</string>
|
||||
</property>
|
||||
<layout class="QGridLayout">
|
||||
<item row="0" column="0" rowspan="3">
|
||||
<widget class="AvatarWidget" name="nextavatar" native="true">
|
||||
<widget class="AvatarWidget" name="nextavatar">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
|
||||
Binary file not shown.
@ -836,18 +836,18 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>ChanMsgItem</name>
|
||||
<message>
|
||||
<location filename="../gui/feeds/ChanMsgItem.ui" line="+348"/>
|
||||
<location filename="../gui/feeds/ChanMsgItem.ui" line="+351"/>
|
||||
<source>Remove Item</source>
|
||||
<translation>Eintrag entfernen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+26"/>
|
||||
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+315"/>
|
||||
<location line="-29"/>
|
||||
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+317"/>
|
||||
<source>Expand</source>
|
||||
<translation>Erweitern</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-124"/>
|
||||
<location line="-72"/>
|
||||
<source>Download</source>
|
||||
<translation>Herunterladen</translation>
|
||||
</message>
|
||||
@ -867,22 +867,27 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Neu</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+84"/>
|
||||
<location line="+139"/>
|
||||
<source>Set as read and remove item</source>
|
||||
<translation>Als gelesen markieren und Eintrag entfernen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+23"/>
|
||||
<source>Unsubscribe From Channel</source>
|
||||
<translation>Kanal abbestellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+81"/>
|
||||
<location line="+26"/>
|
||||
<source>Copy RetroShare Link</source>
|
||||
<translation>Kopiere RetroShare Link</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/feeds/ChanMsgItem.cpp" line="-211"/>
|
||||
<location filename="../gui/feeds/ChanMsgItem.cpp" line="-212"/>
|
||||
<source>Channel Feed</source>
|
||||
<translation>Kanal</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+67"/>
|
||||
<location line="+68"/>
|
||||
<source>Files</source>
|
||||
<translation>Dateien</translation>
|
||||
</message>
|
||||
@ -1038,38 +1043,35 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Kanal erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+156"/>
|
||||
<source>Unsubscribe</source>
|
||||
<translation>Abbestellen</translation>
|
||||
<translation type="obsolete">Abbestellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+25"/>
|
||||
<source>Subscribe To Channel</source>
|
||||
<translation>Kanal abonnieren</translation>
|
||||
<translation type="obsolete">Kanal abonnieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+23"/>
|
||||
<source>Subscribe</source>
|
||||
<translation>Abonnieren</translation>
|
||||
<translation type="obsolete">Abonnieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+163"/>
|
||||
<location line="+233"/>
|
||||
<source>Loading</source>
|
||||
<translation>Lade</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+23"/>
|
||||
<location line="+3"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="+155"/>
|
||||
<source>Set all as read</source>
|
||||
<translation>Alle als gelesen markieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-260"/>
|
||||
<source>Unsubcribe To Channel</source>
|
||||
<translation>Kanal abbestellen</translation>
|
||||
<translation type="obsolete">Kanal abbestellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="+87"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="-73"/>
|
||||
<source>Own Channels</source>
|
||||
<translation>Meine Kanäle</translation>
|
||||
</message>
|
||||
@ -1089,8 +1091,8 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Andere Kanäle</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ChannelFeed.ui" line="+116"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="+66"/>
|
||||
<location filename="../gui/ChannelFeed.ui" line="-104"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="+61"/>
|
||||
<source>Post to Channel</source>
|
||||
<translation>Kanalbeitrag erstellen</translation>
|
||||
</message>
|
||||
@ -1105,7 +1107,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Kanal abbestellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+3"/>
|
||||
<location line="+14"/>
|
||||
<source>Show Channel Details</source>
|
||||
<translation>Zeige Kanal-Details</translation>
|
||||
</message>
|
||||
@ -1120,29 +1122,31 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Verteile Kanal</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+28"/>
|
||||
<location line="+35"/>
|
||||
<source>Copy RetroShare Link</source>
|
||||
<translation>Kopiere RetroShare Link</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+278"/>
|
||||
<location line="+272"/>
|
||||
<source>No Channel Selected</source>
|
||||
<translation>Keinen Kanal gewählt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+270"/>
|
||||
<location line="-321"/>
|
||||
<location line="+576"/>
|
||||
<source>Disable Auto-Download</source>
|
||||
<translation>Deaktiviere Auto-Download</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ChannelFeed.ui" line="+149"/>
|
||||
<location filename="../gui/ChannelFeed.ui" line="+109"/>
|
||||
<location line="+3"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="+2"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="-575"/>
|
||||
<location line="+577"/>
|
||||
<source>Enable Auto-Download</source>
|
||||
<translation>Aktiviere Auto-Download</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="-581"/>
|
||||
<location filename="../gui/ChannelFeed.cpp" line="-567"/>
|
||||
<source>Edit Channel Details</source>
|
||||
<translation>Kanal-Details bearbeiten</translation>
|
||||
</message>
|
||||
@ -4817,24 +4821,24 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>ForumMsgItem</name>
|
||||
<message>
|
||||
<location filename="../gui/feeds/ForumMsgItem.ui" line="+269"/>
|
||||
<location filename="../gui/feeds/ForumMsgItem.ui" line="+286"/>
|
||||
<source>Remove Item</source>
|
||||
<translation>Eintrag entfernen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-20"/>
|
||||
<location line="-37"/>
|
||||
<source>Expand</source>
|
||||
<translation>Erweitern</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-85"/>
|
||||
<location line="+183"/>
|
||||
<location line="+200"/>
|
||||
<location line="+164"/>
|
||||
<source>Subject: </source>
|
||||
<translation>Betreff:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-302"/>
|
||||
<location line="-319"/>
|
||||
<source>Unsubscribe To Forum</source>
|
||||
<translation>Forum abbestellen</translation>
|
||||
</message>
|
||||
@ -4844,7 +4848,12 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Antwort</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+377"/>
|
||||
<location line="+40"/>
|
||||
<source>Set as read and remove item</source>
|
||||
<translation>Als gelesen markieren und Eintrag entfernen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+354"/>
|
||||
<source>Send</source>
|
||||
<translation>Senden</translation>
|
||||
</message>
|
||||
@ -4854,7 +4863,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Unterzeichnen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+92"/>
|
||||
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+93"/>
|
||||
<source>Forum Post</source>
|
||||
<translation>Beitrag</translation>
|
||||
</message>
|
||||
@ -4876,7 +4885,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Als Antwort auf</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+180"/>
|
||||
<location line="+170"/>
|
||||
<source>Please give a Text Message</source>
|
||||
<translation>Bitte Nachricht eingeben</translation>
|
||||
</message>
|
||||
@ -6412,7 +6421,7 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>GenCertDialog</name>
|
||||
<message>
|
||||
<location filename="../gui/GenCertDialog.cpp" line="+197"/>
|
||||
<location filename="../gui/GenCertDialog.cpp" line="+195"/>
|
||||
<location line="+23"/>
|
||||
<source>Generate GPG key Failure</source>
|
||||
<translation>Fehler beim Generieren des GPG Schlüssels</translation>
|
||||
@ -6428,7 +6437,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Alle Felder sind mit min. 3 Zeichen zu versehen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+83"/>
|
||||
<location line="+82"/>
|
||||
<source>Select Trusted Friend</source>
|
||||
<translation>Wähle vertrauten Freund</translation>
|
||||
</message>
|
||||
@ -6438,7 +6447,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Zertifikate (*.pqi *.pem)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/GenCertDialog.ui" line="+699"/>
|
||||
<location filename="../gui/GenCertDialog.ui" line="+697"/>
|
||||
<source>Name</source>
|
||||
<translation>Name</translation>
|
||||
</message>
|
||||
@ -6448,7 +6457,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-82"/>
|
||||
<location line="-80"/>
|
||||
<source>Your profile is associated to a GPG key</source>
|
||||
<translation>Dein Profil ist mit einem GPG Schlüssel verbunden</translation>
|
||||
</message>
|
||||
@ -6457,17 +6466,12 @@ p, li { white-space: pre-wrap; }
|
||||
<translation type="obsolete">Generiere neues Profil</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+196"/>
|
||||
<source>Info</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-95"/>
|
||||
<location line="+99"/>
|
||||
<source>Password</source>
|
||||
<translation>Passwort</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-223"/>
|
||||
<location line="-221"/>
|
||||
<source>Create new Profile</source>
|
||||
<translation>Erstelle neues Profil</translation>
|
||||
</message>
|
||||
@ -6500,7 +6504,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Exportiere ausgewählte Identität</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+24"/>
|
||||
<location line="+22"/>
|
||||
<source>Use identity</source>
|
||||
<translation>Benutze Identität</translation>
|
||||
</message>
|
||||
@ -6543,12 +6547,12 @@ Diese Information ist für GPG erforderlich, aber du kannst durch Eingabe einer
|
||||
<translation>Nutze einen aussagekräftigen Ort (z.B. home, laptop). Dieses Feld wird genutzt um verschiedene Installationen mit dem selben Identität auseinanderzuhalten.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+26"/>
|
||||
<location line="+22"/>
|
||||
<source>Generate New Identity</source>
|
||||
<translation>Neue Identität erstellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+92"/>
|
||||
<location line="+80"/>
|
||||
<source><!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; }
|
||||
@ -6640,7 +6644,7 @@ p, li { white-space: pre-wrap; }
|
||||
<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:'Arial'; font-size:8pt; font-weight:600;">Du kannst RetroShare an mehreren Orten installieren und das selbe Profil (GPG Schlüssel) verwenden.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/GenCertDialog.cpp" line="-244"/>
|
||||
<location filename="../gui/GenCertDialog.cpp" line="-243"/>
|
||||
<source>[Optional] Visible to your friends, and friends of friends.</source>
|
||||
<translation>[Optional] Sichtbar für deine Freunde und Freunde deiner Freunde.</translation>
|
||||
</message>
|
||||
@ -6763,7 +6767,7 @@ Fill in your GPG password when asked, to sign your new key.</source>
|
||||
Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu unterzeichnen.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+120"/>
|
||||
<location line="+119"/>
|
||||
<location line="+6"/>
|
||||
<source>Multiple instances</source>
|
||||
<translation>Mehrere Instanzen</translation>
|
||||
@ -7486,7 +7490,7 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>HelpBrowser</name>
|
||||
<message>
|
||||
<location filename="../gui/help/browser/helpbrowser.cpp" line="+127"/>
|
||||
<location filename="../gui/help/browser/helpbrowser.cpp" line="+137"/>
|
||||
<location line="+5"/>
|
||||
<source>Error Loading Help Contents: </source>
|
||||
<translation>Fehler beim Laden des Hilfe-Inhalts:</translation>
|
||||
@ -8060,7 +8064,7 @@ Die folgenden Wege sind möglich:</translation>
|
||||
<translation>%1 Freunde verbunden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+748"/>
|
||||
<location line="+745"/>
|
||||
<source>It seems to be an old RetroShare link. Please use copy instead.</source>
|
||||
<translation>Es scheint ein alter RetroShare Link zu sein. Bitte kopiere den Link stattdessen.</translation>
|
||||
</message>
|
||||
@ -8070,7 +8074,7 @@ Die folgenden Wege sind möglich:</translation>
|
||||
<translation>Link ist fehlerhaft.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-756"/>
|
||||
<location line="-753"/>
|
||||
<source>%1 friend connected</source>
|
||||
<translation>%1 Freund verbunden</translation>
|
||||
</message>
|
||||
@ -10003,12 +10007,11 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Unbekannt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-280"/>
|
||||
<source>Authentication matrix</source>
|
||||
<translation>Authentifizierungsmatrix</translation>
|
||||
<translation type="obsolete">Authentifizierungsmatrix</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+1"/>
|
||||
<location line="-279"/>
|
||||
<source>Network View</source>
|
||||
<translation>Netzwerk Ansicht</translation>
|
||||
</message>
|
||||
@ -11622,7 +11625,17 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
<location filename="../main.cpp" line="+87"/>
|
||||
<location filename="../main.cpp" line="+65"/>
|
||||
<source>You appear to have locations associated to DSA keys:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+16"/>
|
||||
<source>DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+40"/>
|
||||
<source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although GPG keys are mentionned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
|
||||
<translation>Diese Version von RetroShare benutzt das OpenPGP-SDK. Der Schlüsselring von GPG4Win wird nicht mehr verwendet, sondern ein eigenen Schlüsselring für alle laufenden Instanzen. <br><br>Du scheinst keinen solchen Schlüsselring zu besitzen, obwohl Schlüssel von exisitierenden RetroShare Accounts benötigt werden. Vielleicht hast du auch gerade zu dieser Version gewechselt.</translation>
|
||||
</message>
|
||||
@ -11632,19 +11645,19 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Wähle zwischen:<br><ul><li><b>Ok</b> um den existierenden Schlüsselring von gnupg zu kopieren (sicherste Wahl), oder</li><li><b>Verwerfen</b> um mit einem neuen Schlüsselring zu starten (RetroShare legt dir einen neuen Schlüssel an oder du kannst einen vorher gespeicherten Schlüssel verwenden).</li><li><b>Abbrechen</b> um zu beenden und den Schlüsselring selbst zu kopieren (Du benötigst einige PGP-Kenntnisse</li></ul></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+22"/>
|
||||
<location line="+126"/>
|
||||
<location line="+31"/>
|
||||
<location line="+125"/>
|
||||
<source>RetroShare</source>
|
||||
<translation>RetroShare</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-119"/>
|
||||
<location line="-118"/>
|
||||
<source>Inititialize failed. Wrong or missing installation of gpg.</source>
|
||||
<translation>Initialisierung fehlgeschlagen. GPG fehlt oder es ist eine falsche Version installiert.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+5"/>
|
||||
<location line="+114"/>
|
||||
<location line="+113"/>
|
||||
<source>An unexpected error occured. Please report 'RsInit::InitRetroShare unexpected return code %1'.</source>
|
||||
<translation>Ein unerwarteter Fehler ist aufgetreten. Bitte melde 'RsInit::InitRetroShare unexpected return code %1'.</translation>
|
||||
</message>
|
||||
@ -12603,7 +12616,7 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>Rshare</name>
|
||||
<message>
|
||||
<location filename="../rshare.cpp" line="+277"/>
|
||||
<location filename="../rshare.cpp" line="+275"/>
|
||||
<source>Invalid language code specified: </source>
|
||||
<translation>Ungültige Sprach-Codierung ausgewählt: </translation>
|
||||
</message>
|
||||
@ -14001,25 +14014,24 @@ p, li { white-space: pre-wrap; }
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+203"/>
|
||||
<location line="+192"/>
|
||||
<source>Log In</source>
|
||||
<translation>Anmelden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-35"/>
|
||||
<source><!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;"><a href="Info"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">Info...</span></a></p></body></html></source>
|
||||
<translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<translation type="obsolete"><!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;"><a href="Info"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">Info...</span></a></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+11"/>
|
||||
<location line="-24"/>
|
||||
<source>Opens a dialog for creating a new profile or
|
||||
adding locations to an existing profile.
|
||||
The current identities/locations will not be affected.</source>
|
||||
@ -14051,7 +14063,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Passwort speichern</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-138"/>
|
||||
<location line="-127"/>
|
||||
<source><!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; }
|
||||
@ -14061,7 +14073,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation><!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 align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-size:18pt; color:#55aaff;">Anmeldung</span></p><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:18pt; color:#55aaff;"></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/StartDialog.cpp" line="+175"/>
|
||||
<location filename="../gui/StartDialog.cpp" line="+174"/>
|
||||
<source>Login Failure</source>
|
||||
<translation>Anmeldefehler</translation>
|
||||
</message>
|
||||
@ -14103,7 +14115,7 @@ Lockdatei:
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+47"/>
|
||||
<location line="+41"/>
|
||||
<location line="+3"/>
|
||||
<location line="+2"/>
|
||||
<source>Warning</source>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user