Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the GoTo buttons from the feeds and added clickable links.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-05-03 23:04:42 +00:00
parent ac18995bdf
commit 73daae5992
15 changed files with 786 additions and 922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1252
retroshare-gui/src/gui/ChannelFeed.ui
View File

File diff suppressed because it is too large Load Diff

34
retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
View File

@ -28,8 +28,6 @@
#include "SubFileItem.h"
#include "gui/notifyqt.h"
#include "util/misc.h"
#include "gui/MainWindow.h"
#include "gui/ChannelFeed.h"
#include "gui/RetroShareLink.h"
#include <retroshare/rschannels.h>
@ -56,7 +54,6 @@ ChanMsgItem::ChanMsgItem(FeedHolder *parent, uint32_t feedId, std::string chanId
/* general ones */
connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
/* specific */
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) );
@ -106,10 +103,12 @@ void ChanMsgItem::updateItemStatic()
if (!mIsHome)
{
title = "Channel Feed: ";
title += QString::fromStdWString(ci.channelName);
title = tr("Channel Feed") + ": ";
RetroShareLink link(RetroShareLink::TYPE_CHANNEL, QString::fromStdWString(ci.channelName), QString::fromStdString(ci.channelId), "");
title += link.toHtml();
titleLabel->setText(title);
subjectLabel->setText(QString::fromStdWString(cmi.subject));
RetroShareLink msgLink(RetroShareLink::TYPE_CHANNEL, QString::fromStdWString(cmi.subject), QString::fromStdString(cmi.channelId), QString::fromStdString(cmi.msgId));
subjectLabel->setText(msgLink.toHtml());
if ((ci.channelFlags & RS_DISTRIB_SUBSCRIBED) || (ci.channelFlags & RS_DISTRIB_ADMIN)) {
unsubscribeButton->setEnabled(true);
@ -118,7 +117,6 @@ void ChanMsgItem::updateItemStatic()
}
readButton->hide();
newLabel->hide();
gotoButton->show();
copyLinkButton->hide();
}
else
@ -132,7 +130,6 @@ void ChanMsgItem::updateItemStatic()
unsubscribeButton->setEnabled(false);
clearButton->hide();
unsubscribeButton->hide();
gotoButton->hide();
copyLinkButton->show();
if ((ci.channelFlags & RS_DISTRIB_SUBSCRIBED) || (ci.channelFlags & RS_DISTRIB_ADMIN)) {
@ -334,21 +331,6 @@ void ChanMsgItem::removeItem()
}
}
void ChanMsgItem::gotoHome()
{
#ifdef DEBUG_ITEM
std::cerr << "ChanMsgItem::gotoHome()";
std::cerr << std::endl;
#endif
MainWindow::showWindow(MainWindow::Channels);
ChannelFeed *channelFeed = dynamic_cast<ChannelFeed*>(MainWindow::getPage(MainWindow::Channels));
if (channelFeed) {
channelFeed->navigate(mChanId, mMsgId);
}
}
/*********** SPECIFIC FUNCTIONS ***********************/
void ChanMsgItem::unsubscribeChannel()
@ -419,9 +401,9 @@ void ChanMsgItem::copyLink()
return;
}
ChannelInfo ci;
if (rsChannels->getChannelInfo(mChanId, ci)) {
RetroShareLink link(RetroShareLink::TYPE_CHANNEL, QString::fromStdWString(ci.channelName), QString::fromStdString(ci.channelId), QString::fromStdString(mMsgId));
ChannelMsgInfo cmi;
if (rsChannels->getChannelMessage(mChanId, mMsgId, cmi)) {
RetroShareLink link(RetroShareLink::TYPE_CHANNEL, QString::fromStdWString(cmi.subject), QString::fromStdString(cmi.channelId), QString::fromStdString(cmi.msgId));
if (link.valid() && link.type() == RetroShareLink::TYPE_CHANNEL) {
std::vector<RetroShareLink> urls;
urls.push_back(link);

1
retroshare-gui/src/gui/feeds/ChanMsgItem.h
View File

@ -44,7 +44,6 @@ public:
private slots:
/* default stuff */
void gotoHome();
void removeItem();
void toggle();

48
retroshare-gui/src/gui/feeds/ChanMsgItem.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>583</width>
<width>546</width>
<height>208</height>
</rect>
</property>
@ -150,9 +150,12 @@ p, li { white-space: pre-wrap; }
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="8" rowspan="2" colspan="5">
<item row="0" column="7" rowspan="2" colspan="5">
<widget class="QLabel" name="datetimelabel">
<property name="font">
<font>
@ -170,7 +173,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="9" colspan="4">
<item row="2" column="8" colspan="4">
<widget class="QLabel" name="filelabel">
<property name="font">
<font>
@ -185,7 +188,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="0" colspan="9">
<item row="2" column="0" colspan="8">
<widget class="QLabel" name="subjectLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
@ -209,6 +212,9 @@ p, li { white-space: pre-wrap; }
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
@ -319,14 +325,14 @@ border-radius: 3px}</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="9">
<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="8" colspan="2">
<item row="4" column="7" colspan="2">
<widget class="QPushButton" name="unsubscribeButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -352,7 +358,7 @@ border-radius: 3px}</string>
</property>
</widget>
</item>
<item row="4" column="11">
<item row="4" column="10">
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -378,7 +384,7 @@ border-radius: 3px}</string>
</property>
</widget>
</item>
<item row="4" column="12">
<item row="4" column="11">
<widget class="QPushButton" name="expandButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -408,32 +414,6 @@ border-radius: 3px}</string>
</widget>
</item>
<item row="4" column="6">
<widget class="QPushButton" name="gotoButton">
<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>Go to Channel Message</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
</property>
</widget>
</item>
<item row="4" column="7">
<widget class="QPushButton" name="copyLinkButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">

28
retroshare-gui/src/gui/feeds/ChanNewItem.cpp
View File

@ -21,8 +21,7 @@
#include "ChanNewItem.h"
#include "FeedHolder.h"
#include "gui/MainWindow.h"
#include "gui/ChannelFeed.h"
#include "gui/RetroShareLink.h"
#include <retroshare/rschannels.h>
@ -45,7 +44,6 @@ ChanNewItem::ChanNewItem(FeedHolder *parent, uint32_t feedId, std::string chanId
/* general ones */
connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
/* specific ones */
connect( subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeChannel ( void ) ) );
@ -71,7 +69,8 @@ void ChanNewItem::updateItemStatic()
ChannelInfo ci;
if (rsChannels->getChannelInfo(mChanId, ci))
{
nameLabel->setText(QString::fromStdWString(ci.channelName));
RetroShareLink link(RetroShareLink::TYPE_CHANNEL, QString::fromStdWString(ci.channelName), QString::fromStdString(ci.channelId), "");
nameLabel->setText(link.toHtml());
descLabel->setText(QString::fromStdWString(ci.channelDesc));
@ -101,25 +100,24 @@ void ChanNewItem::updateItemStatic()
}
else
{
nameLabel->setText("Unknown Channel");
nameLabel->setText(tr("Unknown Channel"));
titleLabel->setText("Channel ???");
descLabel->setText("");
}
if (mIsNew)
{
titleLabel->setText("New Channel");
titleLabel->setText(tr("New Channel"));
}
else
{
titleLabel->setText("Updated Channel");
titleLabel->setText(tr("Updated Channel"));
}
if (mIsHome)
{
/* disable buttons */
clearButton->setEnabled(false);
//gotoButton->setEnabled(false);
}
}
@ -171,20 +169,6 @@ void ChanNewItem::removeItem()
}
void ChanNewItem::gotoHome()
{
#ifdef DEBUG_ITEM
std::cerr << "ChanNewItem::gotoHome()";
std::cerr << std::endl;
#endif
MainWindow::showWindow(MainWindow::Channels);
ChannelFeed *channelFeed = dynamic_cast<ChannelFeed*>(MainWindow::getPage(MainWindow::Channels));
if (channelFeed) {
channelFeed->navigate(mChanId, "");
}
}
/*********** SPECIFIC FUNCTIOSN ***********************/

1
retroshare-gui/src/gui/feeds/ChanNewItem.h
View File

@ -42,7 +42,6 @@ public:
private slots:
/* default stuff */
void gotoHome();
void removeItem();
void toggle();

26
retroshare-gui/src/gui/feeds/ChanNewItem.ui
View File

@ -75,6 +75,9 @@ border-radius: 2px;}</string>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
@ -95,6 +98,9 @@ border-radius: 2px;}</string>
<property name="text">
<string notr="true">New Channel</string>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@ -117,26 +123,6 @@ border-radius: 2px;}</string>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="gotoButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Go to Channel</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="subscribeButton">
<property name="sizePolicy">

32
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View File

@ -24,8 +24,7 @@
#include "ForumMsgItem.h"
#include "FeedHolder.h"
#include "gui/MainWindow.h"
#include "gui/ForumsDialog.h"
#include "gui/RetroShareLink.h"
#include <retroshare/rsforums.h>
#include <retroshare/rsmsgs.h>
@ -54,7 +53,6 @@ ForumMsgItem::ForumMsgItem(FeedHolder *parent, uint32_t feedId, const std::strin
/* general ones */
connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
/* specific ones */
connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeForum ( void ) ) );
@ -88,8 +86,9 @@ void ForumMsgItem::updateItemStatic()
ForumInfo fi;
if (rsForums->getForumInfo(mForumId, fi))
{
RetroShareLink link(RetroShareLink::TYPE_FORUM, QString::fromStdWString(fi.forumName), QString::fromStdString(fi.forumId), "");
QString title = tr("Forum Post") + ": ";
title += QString::fromStdWString(fi.forumName);
title += link.toHtml();
titleLabel->setText(title);
if (fi.subscribeFlags & (RS_DISTRIB_ADMIN | RS_DISTRIB_SUBSCRIBED))
@ -135,6 +134,8 @@ void ForumMsgItem::updateItemStatic()
mIsTop = true;
}
RetroShareLink link(RetroShareLink::TYPE_FORUM, QString::fromStdWString(msg.title), QString::fromStdString(msg.forumId), QString::fromStdString(msg.msgId));
if (mIsTop)
{
mGpgIdPrev = msg.srcId;
@ -148,7 +149,7 @@ void ForumMsgItem::updateItemStatic()
namelabel->setText(tr("Anonymous"));
}
prevSubLabel->setText(QString::fromStdWString(msg.title));
prevSubLabel->setText(link.toHtml());
prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
QDateTime qtime;
@ -171,7 +172,7 @@ void ForumMsgItem::updateItemStatic()
nextnamelabel->setText(tr("Anonymous"));
}
nextSubLabel->setText(QString::fromStdWString(msg.title));
nextSubLabel->setText(link.toHtml());
nextMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
QDateTime qtime;
@ -186,7 +187,8 @@ void ForumMsgItem::updateItemStatic()
{
mGpgIdPrev = msgParent.srcId;
prevSubLabel->setText(QString::fromStdWString(msgParent.title));
RetroShareLink linkParent(RetroShareLink::TYPE_FORUM, QString::fromStdWString(msgParent.title), QString::fromStdString(msgParent.forumId), QString::fromStdString(msgParent.msgId));
prevSubLabel->setText(linkParent.toHtml());
prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msgParent.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
if (rsPeers->getPeerName(msgParent.srcId) !="")
@ -208,7 +210,6 @@ void ForumMsgItem::updateItemStatic()
/* header stuff */
subjectLabel->setText(QString::fromStdWString(msg.title));
srcLabel->setText(QString::fromStdString(msg.srcId));
}
if (mIsHome)
@ -285,21 +286,6 @@ void ForumMsgItem::removeItem()
}
}
void ForumMsgItem::gotoHome()
{
#ifdef DEBUG_ITEM
std::cerr << "ForumMsgItem::gotoHome()";
std::cerr << std::endl;
#endif
MainWindow::showWindow(MainWindow::Forums);
ForumsDialog *forumsDialog = dynamic_cast<ForumsDialog*>(MainWindow::getPage(MainWindow::Forums));
if (forumsDialog) {
forumsDialog->navigate(mForumId, mPostId);
}
}
/*********** SPECIFIC FUNCTIOSN ***********************/

1
retroshare-gui/src/gui/feeds/ForumMsgItem.h
View File

@ -42,7 +42,6 @@ public:
private slots:
/* default stuff */
void gotoHome();
void removeItem();
void toggle();

46
retroshare-gui/src/gui/feeds/ForumMsgItem.ui
View File

@ -64,7 +64,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation.png</pixmap>
<pixmap>:/images/konversation.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -93,6 +93,9 @@ border-radius: 10px}</string>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -144,7 +147,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property>
</widget>
@ -164,7 +167,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property>
</widget>
@ -204,6 +207,9 @@ border-radius: 10px}</string>
<property name="text">
<string notr="true">Subject...</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -245,26 +251,6 @@ border-radius: 10px}</string>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="gotoButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Go to Forum Message</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="unsubscribeButton">
<property name="sizePolicy">
@ -280,7 +266,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
</property>
</widget>
@ -316,7 +302,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/replymail24.png</normaloff>:/images/replymail24.png</iconset>
</property>
</widget>
@ -406,6 +392,9 @@ border-radius: 10px}</string>
<property name="text">
<string notr="true">Message is about ???</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -567,6 +556,9 @@ border-radius: 10px}</string>
<property name="text">
<string notr="true">Message is about ???</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -659,8 +651,6 @@ border-radius: 10px}</string>
</item>
</layout>
</widget>
<resources>
<include location="../images.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

23
retroshare-gui/src/gui/feeds/ForumNewItem.cpp
View File

@ -21,11 +21,10 @@
#include "ForumNewItem.h"
#include "FeedHolder.h"
#include "gui/MainWindow.h"
#include "gui/ForumsDialog.h"
#include <retroshare/rsforums.h>
#include "gui/forums/CreateForumMsg.h"
#include "gui/RetroShareLink.h"
/****
* #define DEBUG_ITEM 1
@ -44,7 +43,6 @@ ForumNewItem::ForumNewItem(FeedHolder *parent, uint32_t feedId, std::string foru
/* general ones */
connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
/* specific ones */
connect( subscribeButton, SIGNAL( clicked( void ) ), this, SLOT( subscribeForum ( void ) ) );
@ -72,7 +70,8 @@ void ForumNewItem::updateItemStatic()
ForumInfo fi;
if (rsForums->getForumInfo(mForumId, fi))
{
nameLabel->setText(QString::fromStdWString(fi.forumName));
RetroShareLink link(RetroShareLink::TYPE_FORUM, QString::fromStdWString(fi.forumName), QString::fromStdString(fi.forumId), "");
nameLabel->setText(link.toHtml());
descLabel->setText(QString::fromStdWString(fi.forumDesc));
@ -86,7 +85,6 @@ void ForumNewItem::updateItemStatic()
subscribeButton->setEnabled(true);
postButton->setEnabled(false);
}
/* should also check the other flags */
}
@ -110,7 +108,6 @@ void ForumNewItem::updateItemStatic()
{
/* disable buttons */
clearButton->setEnabled(false);
//gotoButton->setEnabled(false);
}
}
@ -162,20 +159,6 @@ void ForumNewItem::removeItem()
}
void ForumNewItem::gotoHome()
{
#ifdef DEBUG_ITEM
std::cerr << "ForumNewItem::gotoHome()";
std::cerr << std::endl;
#endif
MainWindow::showWindow(MainWindow::Forums);
ForumsDialog *forumsDialog = dynamic_cast<ForumsDialog*>(MainWindow::getPage(MainWindow::Forums));
if (forumsDialog) {
forumsDialog->navigate(mForumId, "");
}
}
/*********** SPECIFIC FUNCTIOSN ***********************/

1
retroshare-gui/src/gui/feeds/ForumNewItem.h
View File

@ -42,7 +42,6 @@ public:
private slots:
/* default stuff */
void gotoHome();
void removeItem();
void toggle();

39
retroshare-gui/src/gui/feeds/ForumNewItem.ui
View File

@ -55,7 +55,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/konversation.png</pixmap>
<pixmap>:/images/konversation.png</pixmap>
</property>
</widget>
</item>
@ -106,6 +106,9 @@ border-radius: 10px}</string>
<property name="text">
<string notr="true">name</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -124,26 +127,6 @@ border-radius: 10px}</string>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="gotoButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Go to Forum</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="subscribeButton">
<property name="sizePolicy">
@ -159,7 +142,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
</property>
</widget>
@ -170,7 +153,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
</property>
</widget>
@ -206,7 +189,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
</property>
</widget>
@ -229,7 +212,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset>
<normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
</property>
</widget>
@ -266,7 +249,7 @@ border-radius: 10px}</string>
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/contacts24.png</pixmap>
<pixmap>:/images/contacts24.png</pixmap>
</property>
</widget>
</item>
@ -311,8 +294,6 @@ border-radius: 10px}</string>
</item>
</layout>
</widget>
<resources>
<include location="../images.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

176
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -853,13 +853,13 @@ p, li { white-space: pre-wrap; }
<context>
<name>ChanMsgItem</name>
<message>
<location filename="../gui/feeds/ChanMsgItem.ui" line="+370"/>
<location filename="../gui/feeds/ChanMsgItem.ui" line="+373"/>
<source>Remove Item</source>
<translation>Eintrag entfernen</translation>
</message>
<message>
<location line="+26"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+320"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+317"/>
<source>Expand</source>
<translation>Erweitern</translation>
</message>
@ -897,17 +897,21 @@ p, li { white-space: pre-wrap; }
<translation>Kanal abbestellen</translation>
</message>
<message>
<location line="+81"/>
<source>Go to Channel Message</source>
<translation>Gehe zum Kanalbeitrag</translation>
<translation type="obsolete">Gehe zum Kanalbeitrag</translation>
</message>
<message>
<location line="+26"/>
<location line="+81"/>
<source>Copy RetroShare Link</source>
<translation>Kopiere RetroShare Link</translation>
</message>
<message>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="-101"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="-211"/>
<source>Channel Feed</source>
<translation>Kanal</translation>
</message>
<message>
<location line="+110"/>
<source>Warning! You have less than %1 hours and %2 minute before this file is delted Consider saving it.</source>
<translation type="unfinished"></translation>
</message>
@ -920,7 +924,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>ChanNewItem</name>
<message>
<location filename="../gui/feeds/ChanNewItem.ui" line="+189"/>
<location filename="../gui/feeds/ChanNewItem.ui" line="+175"/>
<source>Remove Item</source>
<translation>Eintrag entfernen</translation>
</message>
@ -930,12 +934,26 @@ p, li { white-space: pre-wrap; }
<translation>Kanal abonnieren</translation>
</message>
<message>
<location line="-20"/>
<source>Go to Channel</source>
<translation>Gehe zum Kanal</translation>
<translation type="obsolete">Gehe zum Kanal</translation>
</message>
<message>
<location line="+40"/>
<location filename="../gui/feeds/ChanNewItem.cpp" line="+103"/>
<source>Unknown Channel</source>
<translation>Unbekannter Kanal</translation>
</message>
<message>
<location line="+7"/>
<source>New Channel</source>
<translation>Neuer Kanal</translation>
</message>
<message>
<location line="+4"/>
<source>Updated Channel</source>
<translation>Geänderter Kanal</translation>
</message>
<message>
<location filename="../gui/feeds/ChanNewItem.ui" line="+20"/>
<source>Expand</source>
<translation>Erweitern</translation>
</message>
@ -1045,7 +1063,7 @@ p, li { white-space: pre-wrap; }
<translation>Alle als gelesen markieren</translation>
</message>
<message>
<location line="+27"/>
<location line="+7"/>
<source>Enable Auto-download</source>
<translation>Aktiviere Auto-Download</translation>
</message>
@ -1055,7 +1073,7 @@ p, li { white-space: pre-wrap; }
<translation>Kanal erstellen</translation>
</message>
<message>
<location line="-219"/>
<location line="-199"/>
<source>Unsubscribe</source>
<translation>Abbestellen</translation>
</message>
@ -3533,7 +3551,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>ForumMsgItem</name>
<message>
<location filename="../gui/feeds/ForumMsgItem.ui" line="+161"/>
<location filename="../gui/feeds/ForumMsgItem.ui" line="+164"/>
<source>Remove Item</source>
<translation>Eintrag entfernen</translation>
</message>
@ -3544,18 +3562,17 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+57"/>
<location line="+196"/>
<location line="+161"/>
<location line="+179"/>
<location line="+164"/>
<source>Subject: </source>
<translation>Betreff:</translation>
</message>
<message>
<location line="-298"/>
<source>Go to Forum Message</source>
<translation>Gehe zum Forumbeitrag</translation>
<translation type="obsolete">Gehe zum Forumbeitrag</translation>
</message>
<message>
<location line="+20"/>
<location line="-281"/>
<source>Unsubscribe To Forum</source>
<translation>Forum abbestellen</translation>
</message>
@ -3565,7 +3582,7 @@ p, li { white-space: pre-wrap; }
<translation>Antwort</translation>
</message>
<message>
<location line="+331"/>
<location line="+337"/>
<source>Send</source>
<translation>Senden</translation>
</message>
@ -3575,7 +3592,7 @@ p, li { white-space: pre-wrap; }
<translation>Unterzeichnen</translation>
</message>
<message>
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+91"/>
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+90"/>
<source>Forum Post</source>
<translation>Beitrag</translation>
</message>
@ -3585,19 +3602,19 @@ p, li { white-space: pre-wrap; }
<translation>Unbekannter Forumbeitrag</translation>
</message>
<message>
<location line="+32"/>
<location line="+34"/>
<location line="+23"/>
<location line="+27"/>
<location line="+28"/>
<source>Anonymous</source>
<translation>Anonym</translation>
</message>
<message>
<location line="-16"/>
<location line="-17"/>
<source>In Reply to</source>
<translation>Als Antwort auf</translation>
</message>
<message>
<location line="+180"/>
<location line="+165"/>
<source>Please give a Text Message</source>
<translation>Bitte Nachricht eingeben</translation>
</message>
@ -3610,7 +3627,7 @@ p, li { white-space: pre-wrap; }
<translation>Formular</translation>
</message>
<message>
<location line="+209"/>
<location line="+192"/>
<source>Remove Item</source>
<translation>Eintrag entfernen</translation>
</message>
@ -3620,12 +3637,11 @@ p, li { white-space: pre-wrap; }
<translation>Forum abonnieren</translation>
</message>
<message>
<location line="-20"/>
<source>Go to Forum</source>
<translation>Gehe zum Forum</translation>
<translation type="obsolete">Gehe zum Forum</translation>
</message>
<message>
<location line="+67"/>
<location line="+47"/>
<source>Expand</source>
<translation>Erweitern</translation>
</message>
@ -3656,7 +3672,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>ForumsDialog</name>
<message>
<location filename="../gui/ForumsDialog.cpp" line="+273"/>
<location filename="../gui/ForumsDialog.cpp" line="+275"/>
<source>Subscribe to Forum</source>
<translation>Forum abonnieren</translation>
</message>
@ -3722,7 +3738,7 @@ p, li { white-space: pre-wrap; }
<translation>Alle reduzieren</translation>
</message>
<message>
<location line="+94"/>
<location line="+111"/>
<source>Hide</source>
<translation>Verbergen</translation>
</message>
@ -3771,7 +3787,7 @@ p, li { white-space: pre-wrap; }
<translation>Du kannst einem anonymen Autor nicht antworten</translation>
</message>
<message>
<location line="-1344"/>
<location line="-1363"/>
<source>Your Forums</source>
<translation>Deine Foren</translation>
</message>
@ -3913,8 +3929,8 @@ p, li { white-space: pre-wrap; }
<translation>Druckvorschau</translation>
</message>
<message>
<location filename="../gui/ForumsDialog.cpp" line="+121"/>
<location line="+1144"/>
<location filename="../gui/ForumsDialog.cpp" line="+123"/>
<location line="+1161"/>
<source>Start New Thread</source>
<translation>Erstelle neues Thema</translation>
</message>
@ -3942,7 +3958,7 @@ p, li { white-space: pre-wrap; }
<translation>Inhalt</translation>
</message>
<message>
<location filename="../gui/ForumsDialog.cpp" line="-1131"/>
<location filename="../gui/ForumsDialog.cpp" line="-1148"/>
<location line="+3"/>
<source>Mark as read</source>
<translation>Als gelesen markieren</translation>
@ -5297,7 +5313,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>MainWindow</name>
<message>
<location filename="../gui/MainWindow.cpp" line="+215"/>
<location filename="../gui/MainWindow.cpp" line="+221"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
@ -5308,29 +5324,29 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+8"/>
<location line="+287"/>
<location line="+283"/>
<source>Transfers</source>
<translation>Übertragungen</translation>
</message>
<message>
<location line="-279"/>
<location line="+211"/>
<location line="-275"/>
<location line="+207"/>
<source>Messages</source>
<translation>Nachrichten</translation>
</message>
<message>
<location line="-208"/>
<location line="+242"/>
<location line="-204"/>
<location line="+238"/>
<source>Channels</source>
<translation>Kanäle</translation>
</message>
<message>
<location line="-238"/>
<location line="-234"/>
<source>Blogs</source>
<translation>Blogs</translation>
</message>
<message>
<location line="+255"/>
<location line="+251"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
@ -5338,20 +5354,20 @@ p, li { white-space: pre-wrap; }
<location line="+94"/>
<location line="+41"/>
<location line="+41"/>
<location line="+163"/>
<location line="+160"/>
<source>%1 new messages</source>
<translation>%1 neue Nachrichten</translation>
</message>
<message>
<location line="-243"/>
<location line="-240"/>
<location line="+41"/>
<location line="+41"/>
<location line="+163"/>
<location line="+160"/>
<source>%1 new message</source>
<translation>%1 neue Nachricht</translation>
</message>
<message>
<location line="-141"/>
<location line="-138"/>
<source>You have %1 completed downloads</source>
<translation>Du hast %1 fertige Downloads</translation>
</message>
@ -5386,7 +5402,7 @@ p, li { white-space: pre-wrap; }
<translation>%1 Freunde verbunden</translation>
</message>
<message>
<location line="+682"/>
<location line="+656"/>
<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>
@ -5396,23 +5412,23 @@ p, li { white-space: pre-wrap; }
<translation>Link ist fehlerhaft.</translation>
</message>
<message>
<location line="-690"/>
<location line="-664"/>
<source>%1 friend connected</source>
<translation>%1 Freund verbunden</translation>
</message>
<message>
<location line="+323"/>
<location line="+297"/>
<source>Internal Error</source>
<translation>Interener Fehler</translation>
</message>
<message>
<location filename="../gui/MainWindow.ui" line="+88"/>
<location filename="../gui/MainWindow.cpp" line="-43"/>
<location filename="../gui/MainWindow.cpp" line="-709"/>
<source>Options</source>
<translation>Optionen</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="+76"/>
<location filename="../gui/MainWindow.cpp" line="+742"/>
<source>Hide</source>
<translation>Verbergen</translation>
</message>
@ -5422,7 +5438,7 @@ p, li { white-space: pre-wrap; }
<translation>Zeigen</translation>
</message>
<message>
<location line="-757"/>
<location line="-731"/>
<source>RetroShare</source>
<translation></translation>
</message>
@ -5453,7 +5469,7 @@ p, li { white-space: pre-wrap; }
<translation>Schnellstart Assistent</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-174"/>
<location filename="../gui/MainWindow.cpp" line="-170"/>
<source>Search</source>
<translation>Suchen</translation>
</message>
@ -5468,7 +5484,7 @@ p, li { white-space: pre-wrap; }
<translation>Messenger</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="+142"/>
<location filename="../gui/MainWindow.cpp" line="+138"/>
<source>Show/Hide</source>
<translation>Anzeigen/Verbergen</translation>
</message>
@ -5481,25 +5497,25 @@ p, li { white-space: pre-wrap; }
<location line="+186"/>
<location line="+41"/>
<location line="+41"/>
<location line="+163"/>
<location line="+160"/>
<source>You have %1 new messages</source>
<translation>Du hast %1 neue Nachrichten</translation>
</message>
<message>
<location line="-243"/>
<location line="-240"/>
<location line="+41"/>
<location line="+41"/>
<location line="+163"/>
<location line="+160"/>
<source>You have %1 new message</source>
<translation>Du hast %1 neue Nachricht</translation>
</message>
<message>
<location line="+256"/>
<location line="-441"/>
<source>Bandwidth Graph</source>
<translation>Bandbreiten-Graph</translation>
</message>
<message>
<location line="+3"/>
<location line="-2"/>
<source>Open Messenger</source>
<translation>Öffne Messenger</translation>
</message>
@ -5509,7 +5525,7 @@ p, li { white-space: pre-wrap; }
<translation>Schliessen</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-695"/>
<location filename="../gui/MainWindow.cpp" line="+10"/>
<source>Minimize</source>
<translation>Minimieren</translation>
</message>
@ -5519,7 +5535,7 @@ p, li { white-space: pre-wrap; }
<translation>Maximieren</translation>
</message>
<message>
<location line="-140"/>
<location line="-136"/>
<source>Links Cloud</source>
<translation>Verknüpfungs-Wolke</translation>
</message>
@ -5534,7 +5550,7 @@ p, li { white-space: pre-wrap; }
<translation></translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="+826"/>
<location filename="../gui/MainWindow.cpp" line="+116"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
@ -5544,33 +5560,33 @@ p, li { white-space: pre-wrap; }
<translation>Über</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-847"/>
<location line="+217"/>
<location filename="../gui/MainWindow.cpp" line="-137"/>
<location line="+213"/>
<source>Forums</source>
<translation>Foren</translation>
</message>
<message>
<location line="-289"/>
<location line="-285"/>
<source>RetroShare %1 a secure decentralised communication platform</source>
<translation>RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform</translation>
</message>
<message>
<location line="+913"/>
<location line="+202"/>
<source>Open Messages</source>
<translation>Öffne Nachrichten</translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>Applications</source>
<translation>Anwendungen</translation>
</message>
<message>
<location line="-834"/>
<location line="-124"/>
<source>Plugins</source>
<translation></translation>
</message>
<message>
<location line="+850"/>
<location line="+820"/>
<source>Do you really want to exit RetroShare ?</source>
<translation>Willst Du RetroShare wirklich beenden?</translation>
</message>
@ -5580,7 +5596,7 @@ p, li { white-space: pre-wrap; }
<translation>Wirklich beenden?</translation>
</message>
<message>
<location line="-746"/>
<location line="-720"/>
<source>Low disk space warning</source>
<translation>Wenig Festplatenspeicher</translation>
</message>
@ -6173,7 +6189,7 @@ Willst Du die Nachricht speichern ?</translation>
<name>MessagesDialog</name>
<message>
<location filename="../gui/MessagesDialog.ui" line="+576"/>
<location filename="../gui/MessagesDialog.cpp" line="+668"/>
<location filename="../gui/MessagesDialog.cpp" line="+687"/>
<source>New Message</source>
<translation>Neue Nachricht</translation>
</message>
@ -6189,14 +6205,14 @@ Willst Du die Nachricht speichern ?</translation>
</message>
<message>
<location filename="../gui/MessagesDialog.ui" line="+393"/>
<location filename="../gui/MessagesDialog.cpp" line="-376"/>
<location filename="../gui/MessagesDialog.cpp" line="-396"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<location line="-5"/>
<location filename="../gui/MessagesDialog.cpp" line="-1"/>
<location line="+834"/>
<location line="+854"/>
<source>From</source>
<translation>Von</translation>
</message>
@ -6369,7 +6385,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../gui/MessagesDialog.ui" line="-898"/>
<location filename="../gui/MessagesDialog.cpp" line="-1563"/>
<location filename="../gui/MessagesDialog.cpp" line="-1583"/>
<source>Subject</source>
<translation>Betreff</translation>
</message>
@ -6409,7 +6425,7 @@ p, li { white-space: pre-wrap; }
<translation>Gewählte Nachricht weiterleiten</translation>
</message>
<message>
<location line="+321"/>
<location line="+341"/>
<source>Remove Messages</source>
<translation>Löschen</translation>
</message>
@ -6454,8 +6470,8 @@ p, li { white-space: pre-wrap; }
<translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
</message>
<message>
<location line="-1540"/>
<location line="+274"/>
<location line="-1560"/>
<location line="+294"/>
<source>Reply to All</source>
<translation>Allen antworten</translation>
</message>
@ -6474,7 +6490,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="-277"/>
<location filename="../gui/MessagesDialog.cpp" line="-326"/>
<location filename="../gui/MessagesDialog.cpp" line="-346"/>
<source>Content</source>
<translation>Inhalt</translation>
</message>
@ -6482,7 +6498,7 @@ p, li { white-space: pre-wrap; }
<location line="+5"/>
<location line="+11"/>
<location filename="../gui/MessagesDialog.cpp" line="-1"/>
<location line="+180"/>
<location line="+200"/>
<source>Tags</source>
<translation>Schlagwörter</translation>
</message>
@ -8942,7 +8958,7 @@ Lockdatei:
<translation>Vielleicht ist das Passwort falsch</translation>
</message>
<message>
<location filename="../gui/RetroShareLink.cpp" line="+480"/>
<location filename="../gui/RetroShareLink.cpp" line="+508"/>
<source>File Request Confirmation</source>
<translation>Bestätigung der Dateianforderung</translation>
</message>